Revised folder structure

Instead of having different scenarios be in different branches we will
have them in folders.