Feature ccase core cleanup

Cleaned up the main project.