Move the classes in the right packages