restructure layouts, add namespaced modules