Re-arrange phpmyadmin salt state structure