Adding Organization modules
Some fixes and merge