Refactoring: Resolving problems with structure of project.