Update folder structure, clean up