Refactoring - introduced concept of NumberSet & Draw/DrawGenerator
Fix line endings
DrawGenerator now generates Draw's