Update readme
Reorganize code
New Build