Re-arrange phpmyadmin salt state syntax
Re-arrange php5 salt state syntax
Re-arrange mysql salt state syntax
Re-arrange the structure of the core salt states