Rearranging project, gatekeeper-zookeeper package, deps pushed out of parent