Update folder structure and readme