initial commit :code structure
fix conflicts in README.md