Update upload code to use newer bson.objectid and fallback to mongodb.objectid if need be. Reorganize files for testing the uploads