Rejiggering file structure