Migrated from magic/router module

Migrated from magic/router module