drop Pages folder and make Modules easier to add