restructured folders and filenames