Move dicts out of class variables
Merge branch 'remove_shared_dicts' into packaging