Update info files, move dependencies around