classes were moved to appropriate folders