routs reorginize and session routs fix
Merge origin/master