Change router.
Method decomposition in setup.js - still need to refactor more.