Fix ordering dependencies. Add appropriate canonical file paths.