Add todo task
Re-arrange php5 salt states structure