rejigged file structure