Moved files based on new folder structure