Restructured core project.
Cleanup.