Fixing moved and removed file issue