ArgumentHandler refactor
  * return_filenames now wont break if the dir has a dir inside
  * renamed methods for clarity