Further re-factoring of the repository declarations given my further understanding - and also to fix an issue where dependencies were not being resolved from a ivy2 layout (at least I think that was the issue).