Wall and pipe restruction

Provided wall and pipe restructuring