Moving keyspace definitions to the right place.