moved everything to its own namespace, cli-enabled example