Reestructured the files.
Fixed references in test.html
Fixed some minor details in the output.