reorg part 1
fixed imports v depends issue
merging with command line functions