Moving command to main app
Simplified control structure.  Made trailing slash needs/expectations explicit.