Some file and class renaming. Adds dom disposal code.