Removed package cyclic dependency