Add /cli & /server
Don't build NFY