Updated autoload and router