Switch develop branch to router implementation