Move classes to right packages