Moved @Route mounts to router component and refactored container
modules.