0.0.55: reorganized and split out system data