Refactor switch route

Created by: harishmathur

Refactoring App.js to simplify the use of Switch/Route and removing nested route as that does not seem to be getting used.