Further reorganisation of JamomaDependencies