move dependencies, better mapping of values, chaining the initial file imports