Update Readme
Refactored generators