Moving things around some more
Initial working commit (test.html loads)