Added organization fields to the Organization object
reverted imports
removed unnecessary imports
Merge branch 'organizationfields'