Move current code into "cli" subproject