Refactoring: moving some classes into different packages