Refactoring of the Navigation Component into two components; one for orbit prediction and one for location contact prediction.