Refactor Application & Route