remove salt states and move pillar files up