Merging code + test of Router Package from old source code base WIP