Added more structure to project