renamed org and add dictionary
Lots of updates
Updates