Refactored dir structure and start key nav in table