Few more changes and updated README
Removed unwanted classes