Properly resolve files dependencies