Refactor walls into structs