Clean up project structure. Set classes as behaviours.