Overhaul plumbing, lay out new controller/directive pair