Refactoring: rm classes in common, ref to remote_file, ref to hyper_v mod