fixed circular imports, changed pickles to binary