re-organization and README improvement