files reorganized into subfolders