Moved previous changes to branch
Removed old files. Updated README
Merged in changes from master