Swap library to the root, cli to cmd/ds