more file structure changes to match server