Added more structure to the project