refactor move classes and renaming