modify structure, fix deps