added cli / changed structure

added cli / changed structure