Move classes belonging together into the same package.