more file structure changes