Router Updates

Updated router class to use static property ::$uri instead of passing it
around as a method parameter.