Fixing NONE issue with object serialization in Python clients. Renaming files to have them make more sense