Refactoring of dependencies / dependency management #10