(fix) router organization. Begin test implementation