Correcting folder structure as per Charles Github