Put everything in one file.
Fixed merge errors.