FileSystem: Finder and Wiper removed, FileSystem added as services