- extracted Router trait
- added router test
- added small fix for Settings (regular file check)