Add shell commands
Move shell codes out of Main
Remove unused classes