Move moving classes around