Refactored architecture. Added Router Interface