merge and style tweaks, credit links to github repo, rearrangement of files for cleaner URLs