Small fixes

Correcting the way --out-dir works: if passed to the program do not create inpx file in "data" subdirectory but rather in out-dir directly and make sure that no empty "data" subdirectory is left after processing is done