Moving classes to new package