Cleanup of README and old code
Refactoring after cleanup
Final step of cleanup