Better command line nav.
Reorganization