Moved file extraction operations to a separate class