Add SimpleHTTPServer as a submodule.
Use the SimpleHTTPServer submodule and remove the old copy of the source files.