file structure fixes