Moved some files around, made it into one file.