Separated code, moved to routing component.
Separated code, moved to routing component.