Move classes to packages