refactoring pages & site structures
wip