More deconstruction plus peer into new file structure