many changes in api Organization controller