moving classes around, refactor