Pushing navigation code down into its own dir
Removed deprecated navigation code