Re-arrange apache salt state structure