Update salt states
Refactor & implement templating with git repo