- Moved recently created classes to correct packages