Eclipse/Aether migration

Mostly dependency and import changes, plus some refactoring due to changes in the Aether API/SPI