updating dependencies
reorganising elements