Relocate some classes and things