Moved file
Fixed missing file.
Fixed #1093
Fixed #1068
Fixed #1098
Fixed #43