Re-structered files and folders