Refactor
Moved a class