South Africa plans law enforcement revamp