Re-ordered directory tree
Fixed keybindings