Moved navigator service to it's own file.