Refactor - classes moved