Fixed up the project structure to make it like the main Portal project structure