Move classes to each package