Abstract NavigationLibrary to static class and remove FixCollection references

[n8rzz]

These two classes should both be static and, as such, the FixCollection references can be removed from the NavigationLibrary

This one is going to be tricky (hence this issue), both classes are used all over the place. The original intend was to pass references to the NavigationLibrary to the classes that needed it, and that worked, but it is getting harder to maintain.