Could you also remove these changes around restructuring the dependency locations? These need to be tested and verified separately.