diff --git a/README.md b/README.md
index 65f846c..3601035 100644
--- a/README.md
+++ b/README.md
@@ -7,29 +7,41 @@ List of EDI Github Resources. PRs Welcome!
 - [Vim](https://github.com/vim-scripts/x12-syntax) - A simple syntax highlighter for EDI X12 files. Currently only Healthcare 270/271s are tested.
 - [Visual Studio Code](https://github.com/Silvenga/vscode-edi-x12-support) - A Visual Studio Code extension aimed at providing basic support for the EDI format.
 - [Notepad++](https://gist.github.com/bhattisatish/6b5f5c90443a64cef192) - A user-defined language file for highlighting EDI X12.
+
+## Standalone editors
 - [X12Tool](https://github.com/RKDN/x12Tool) - A tool for reading and modifying x12/EDI files.
 
 ## Libraries
+
+### Java
 - [Apache NiFi](https://github.com/mrcsparker/nifi-edireader-bundle) - Apache NIFI processor that converts EDI ASC X12 and EDIFACT documents into XML
+- [mantle-edi](https://github.com/moqui/mantle-edi) - Mantle EDI Integrations http://www.moqui.org/mantle.html
+- [x12-parser](https://github.com/imsweb/x12-parser) - A Java parser for ANSI ASC X12 documents.
+### DotNet
 - [EdiEngine](https://github.com/olmelabs/EdiEngine) - Simple .NET EDI Reader, Writer and Validator. Read, Write and Validate X12 EDI files with simple EDI Parser written on C#. 
 - [EDI.Net](https://github.com/indice-co/EDI.Net) - EDI Serializer/Deserializer. Supports EDIFact, X12 and TRADACOMS formats
-- [edicat](https://github.com/notpeter/edicat) - Print and concatenate X12 and Edifact EDI
-- [edifact](https://github.com/php-edifact/edifact) - (PHP) Tools to process EDI messages in UN/EDIFACT format
-- [tdecaluwe/node-edifact](https://github.com/tdecaluwe/node-edifact) - (Javascript) Javascript stream parser for UN/EDIFACT documents. 
-- [ediot](https://github.com/ConsultingMD/ediot) - (Ruby) Electronic Data Interexchange Open Transformer (transforms EDI-834 into CSV)
 - [EdiWeave](https://github.com/Silvenga/EdiWeave) - Open Source Hard-Fork of EdiFabric 
-- [mantle-edi](https://github.com/moqui/mantle-edi) - Mantle EDI Integrations http://www.moqui.org/mantle.html
-- [pyx12](https://github.com/azoner/pyx12) - (Python) HIPAA X12 document validator and converter
-- [StupidEdi](https://github.com/irobayna/stupidedi) - Ruby API for parsing and generating ASC X12 EDI transactions.
+### PHP
+- [edifact](https://github.com/php-edifact/edifact) - (PHP) Tools to process EDI messages in UN/EDIFACT format
+- [edifact-generator](https://github.com/php-edifact/edifact-generator) - Library to create UN/EDIFACT messages
+- [edifact-mapping](https://github.com/php-edifact/edifact-mapping) - UN/EDIFACT mappings in XML, with a PHP provider
+### Javascript
+- [tdecaluwe/node-edifact](https://github.com/tdecaluwe/node-edifact) - (Javascript) Javascript stream parser for UN/EDIFACT documents. 
 - [x12-patient-faker](https://github.com/dlumpp/x12-patient-faker) - Generates test patient data in HIPAA X12 format
-- [x12-parser](https://github.com/imsweb/x12-parser) - A Java parser for ANSI ASC X12 documents.
+### Ruby
+- [ediot](https://github.com/ConsultingMD/ediot) - (Ruby) Electronic Data Interexchange Open Transformer (transforms EDI-834 into CSV)
+- [StupidEdi](https://github.com/irobayna/stupidedi) - Ruby API for parsing and generating ASC X12 EDI transactions.
+
+## CLI utilities
+- [edicat](https://github.com/notpeter/edicat) - Print and concatenate X12 and Edifact EDI
+- [pyx12](https://github.com/azoner/pyx12) - (Python) HIPAA X12 document validator and converter
 
 ## Systems or Paid Services
 - [Bots](https://github.com/bots-edi/bots) - Bots EDI Translator
-- [BizTalk](https://github.com/MicrosoftDocs/biztalk-docs) - Microsoft Biztalk 
+- [BizTalk](https://github.com/MicrosoftDocs/biztalk-docs) - Microsoft Biztalk documentation
 - [MuleSoft](https://github.com/mulesoft/mulesoft-docs) - Main MuleSoft documentation repository
 - [SDK](https://github.com/EdiFabric/Sdk) - Dynamically read, manipulate and write EDI files. From EDIFabric.
-- [EDI Editor](https://www.tallan.com/products/t-connect-edi-management/x12-studio-tool-box/) - EDI editor
+- [EDI Editor](https://www.tallan.com/products/t-connect-edi-management/x12-studio-tool-box/) - X12 EDI editor
 - [T-Connect](https://www.tallan.com/products/t-connect-edi-management/t-connect-edi-management-suite/) - T-Connect is a HIPAA-focused EDI management platform designed to accelerate claim and payment processing, improve first-pass adjudication rates and provide end-to-end visibility into the lifecycle of your data.
 
 ## Examples
@@ -39,3 +51,4 @@ List of EDI Github Resources. PRs Welcome!
 - [EDI-X12](https://github.com/dipique/EDI-X12) - Rough process for generating EDI X12 834 and 837 files from a CSV file. Structured in a way that allows easy transition to other data sources.
 
 
+