Move common code to router-core from DR