Code reorganization
Parse connector added