Updated the naming conventions and removed the navigation files that weren't being used