moves cli files to cli package, injects running policy into server
refactor