moved a few files around. small stylistic changes.