Make refactoring: copy classes to different packages