Reorganize code, modify README