Batch Automation Help (Multiple Saves in Set)

I created an action that sets a color overlay for text and then saves the image. This is repeated in the same action for a handful of colors. After I run this action I have 10 files all saved as .png with the name of the color.

When I try to batch this with multiple images it renames and replaces the files from the previous actions.

Below I am going to show what it currently looks like in file names

Input1: "Text 1 Raw"

Output1: White, Blue, Red, Green, Black, Etc.

Input2: "Text 2 Raw"

Output2: White, Blue, Red, Green, Black, Etc.

This replaces the output 1 files.

I would like it to be

Input1: "Text 1 Raw"

Output1: Text 1 Raw White, Text 1 Raw Blue, Text 1 Raw Red, Text 1 Raw Green, Text 1 Raw Black, Etc.

Input2: "Text 2 Raw"

Output2: Text 2 Raw White, Text 2 Raw Blue, Text 2 Raw Red, Text 2 Raw Green, Text 2 Raw Black, Etc.

Or if they could create subfolders for each raw image.