rejigged the file structure