move classes to its package