Reestructured folders and files