Updated extension code and structure
Removed unnecessary code
Merge pull request #1 from amitdar/master

Update extension code and structure