Updated readme
Reorganization