move classes to new packages