Adding some structure to the project.