Refactoring, move classes to the right package