Add key handling and rejig directory structure
Add elapsed time handling