changing organization to use new common model
deleting deprecated organization files