Changed filenames added DOM document creation
Fixed conflicts