Some refactoring of code, also working on handling concurrency of organization member. Not fully dome yet