refactor, moving classes