Moves more classes to appropriate packages