Changed Request class and added Router class