Updated autoload/include paths