Revert some changes that broke file gathering, added more efficient commandline creation.

@beOn check if it does not break your conversions.