Add navigation & refactor namespace