(fix) router organization. Begin test implementation

Testing is still a work in progress.