added target-dir and autoload