Restructure the project into more logical units.