move classes around