Updated the readme
Updated the directory structure
Fixed merge conflict'