Moved all the files to a new package and formatted them.