Files class and router helper fixed