Code Organization and initial introduction of profile management
Messed up the commit message