clean up study 08 router, rename and re-organize file