Adding show and list commands
Reorg entry points