Move generic scenarios into scenarios folder for alignment