Major refactoring in dir structure and config to get internal pages into the project