more file structure fixes....