moved classes around