Moving path storage to its own file and created a router wrapper.