changed file structure to avoid need for SimpleHTTPServer