navigation file reorganization and comments