move classes around like I should