Move to cli dir
cosmetic change
move App class
Rename