Fix deps structure