Small refactor, moving classes to different packages