move classes into new packages