Update directory structure
Move navbar to includes