Move some classes around