Moved classes to different packages