Reorganized Maven classes into the correct packages