Added more structure to the application