Code reorganization. Parser split.