Restructured folders and files