Added --strip-number and --directories feature