Remove docopt dependencies Issue #1

Restructuring commands to remove docopt dependencies