Made improvements to project structure.