unnecessary files deleted from git. Some refactoring done for adapters
merge conflict solved. Refactored Adapter classes