New file structure. Prepping distribution.