commit before cli overhaul
cli refactor and good directory setup