refactor of classes/packages