remove wall type json, replace with clutter loss json, refactor controller namepsaces