Cleaned up structure of the project.