rabased against latest updated

Moved resources to resource folder

Moved classes to appropriate packages

Removed System out printlns

Formatted code using openmrs code formatter