Revise directory structure
Update README