Refactoring the Routing

Routes can now include option for mobile os ( eg: os: android )
Test updated