fixed pkl paths
a little bit of reorganization