Trying a new folder structure.