Separated into classes
Removed .codelite