fix require statements following restructure - untested