Separated classes & Added menu for chosing a class