Update the folder structure and readme's