Update readme
Reorganize code tree