Start refactoring the solution.
Separate the Core project into layers.