Fixed autoloading & Added support for variable vendor-dir