Moving some classes around to clearer locations.