moved a few files around
moved some html stuff around