[FC19] Support for both block device and image file
Move to-be-removed files into removed subdir