move classes to package