update controllers/routing (resubmit from corrupted PR #52)
Merge pull request #57 from AndrewPodner/restructure-controllers-routing

update controllers/routing