Minor cleanups of windowing. Main change is moving Datastore to Filesystem and adding custom serialization.