Moved things around so that everything is no longer in one gigantic file.