remove more dist files merged from master
untangle the mess of dependencies and remove all circular dependencies. Remove un-necessary dependency injection.