Remove the org package
Merge pull request #468 from Gama11/dev_org

Remove the org package, closes #464