Code Organization and initial introduction of profile management