commence restructuring of navigation

Commence Moving to menu driven navigation