refactored ugly static maps
failed to get rid of stateful converters - go back to maps of classes, not instances
reverted some files committed by mistake