file structure changes II