remove pillar and move salt files up