Move more classes around
More packages moved around