Site structure
Addressing issue #2
Merge