Reorganized s'more content to fit structure

Caroline explained to me that there should be a subdirectory for each
new nested choice, so I rearranged my stuff like that.