Update directory structure and README