Moving classes into sensible sub-packages