more fixes for file structure update