Add more structure to the project