move classes to the rightful place