changing organization forms and views to remove branch and add geometry to orgs