FIX: Correct output for files nested in folders
FIX: parsing of files with spaces