Added folder structure to make a little clearer