New doctests for Entity, EntityStore, Router, Routes, UrlUtils & refactor