Moved some libraries around and fixed up the uploading code some more