developement mile stone 1 - routing clean up
developement mile stone 1 - routing clean up