Fix requirement in the activate script state and remove the nested pillar directory since that is now handled by the top.sls