Grabbing Gus' new folder structure

reverse pull request :+1: