I made the change in Montage for the application package to load the montage package, as that's the correct dependency tree. Seems like it would make sense here too. Could do it now while everything changes, or wait until later to try and minimise the changes as much as possible :)