Merge pull request #1 from denuwanthi/master

listener refactored
ragistry refactored
registry refactored