Moving classes into correct packages, continue cleanups