Rearranged my class repository

fitting class requirements.