more file structure fixes