Bug 1003116 - Refactor route into separate file