Updated folder structure and README