Move states/pillars into /etc/salt.