Refactored functionality into DateTimeTagger and PkgBasenameExtractor