Fixing directory structure and allowing subfolders for pages