Restructured PSI parser and factories, now most things are injected