folder re-organization and README.md update