Moved some classes to other packages to remove ciclic dependency between packages
Fixed issue 75