organize some classes in packages