Update upload code to use newer bson.objectid and fallback to mongodb.ob...

...jectid if need be. Reorganize files for testing the uploads