Moved some items and linked deps.