Move common things to marquise and vaultaire-common packages