More refactoring for release
GA + readme