Restructured Navigation

simplified the navigation for unit testing