Move folders with multiple files to single files on controllers and routes