Feels like there is a lot of overlap in responsibility when it comes to handling files currently, have a look over and see if it can be solved.