Implemented changes in organization as req in #108