Add cli and split system up in more namespaces