Clean up : classes and project properties