rabased against latest updated
moved encounter resource to resource folder
Merge pull request #14 from harsha89/module_cleanup

rabased against latest updated