Merging with branch refactoring. Updated README and removed some unnecessary files.