diff --git a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts
index b8f1c8f86e..367d140f7e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts
@@ -79,6 +79,7 @@ describe('JobProcessor', () => {
     const createJob = (): { job: Job; processor: JobProcessor } => {
       preparers.register('github', mockPreparer);
 
+      new JobProcessor(1);
       const processor = new JobProcessor({
         preparers,
         dockerClient: mockDocker,
diff --git a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts
index c97d5ced79..a1b8795156 100644
--- a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Processor, Job } from './types';
+import { Processor, Job, Stage, StageContext } from './types';
 import { JsonValue } from '@backstage/config';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import { PassThrough } from 'stream';
 import * as uuid from 'uuid';
 import Docker from 'dockerode';
 import winston from 'winston';
-import { RequiredTemplateValues, TemplaterBase } from '../templater';
+import { RequiredTemplateValues, TemplaterBase } from '../stages/templater';
 import { createNewRootLogger } from '@backstage/backend-common';
-import { PreparerBuilder } from '../prepare';
+import { PreparerBuilder } from '../stages/prepare';
 
 export type JobProcessorArguments = {
   preparers: PreparerBuilder;
@@ -36,15 +36,10 @@ export type JobAndDirectoryTuple = {
 };
 
 export class JobProcessor implements Processor {
-  private preparers: PreparerBuilder;
-  private templater: TemplaterBase;
-  private dockerClient: Docker;
   private jobs = new Map<string, Job>();
-
-  constructor({ preparers, templater, dockerClient }: JobProcessorArguments) {
-    this.preparers = preparers;
-    this.templater = templater;
-    this.dockerClient = dockerClient;
+  private stages: Stage[];
+  constructor({ stages }: { stages: Stage[] }) {
+    this.stages = stages;
   }
 
   create(
@@ -66,11 +61,17 @@ export class JobProcessor implements Processor {
     const logger = createNewRootLogger();
     logger.add(new winston.transports.Stream({ stream: logStream }));
 
+    const context: StageContext = {
+      entity,
+      values,
+      logger,
+    };
+
     const job: Job = {
       id,
       logStream,
-      logger,
-      log,
+      context,
+      stages: this.stages.map((stage) => ({}))
       status: 'PENDING',
       metadata: {
         entity,
diff --git a/plugins/scaffolder-backend/src/scaffolder/jobs/types.ts b/plugins/scaffolder-backend/src/scaffolder/jobs/types.ts
index 060d5d400e..b01fae9625 100644
--- a/plugins/scaffolder-backend/src/scaffolder/jobs/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/jobs/types.ts
@@ -16,13 +16,13 @@
 import type { Writable } from 'stream';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/config';
-import { RequiredTemplateValues } from '../templater';
+import { RequiredTemplateValues } from '../stages/templater';
 import { Logger } from 'winston';
 
 // Context will be a mutable object which is passed between stages
 // To share data, but also thinking that we can pass in functions here too
 // To maybe create sub steps or fail the entire thing, or skip stages down the line.
-export type StageContext<T> = T & {
+export type StageContext<T = {}> = T & {
   values: RequiredTemplateValues & Record<string, JsonValue>;
   entity: TemplateEntityV1alpha1;
   logger: Logger;
@@ -35,12 +35,9 @@ export type Stage<T = {}> = {
   handler: (ctx: StageContext<T>) => Promise<void>;
 };
 
-export type Job = {
+export type Job<T = {}> = {
   id: string;
-  metadata: {
-    entity: TemplateEntityV1alpha1;
-    values: RequiredTemplateValues & Record<string, JsonValue>;
-  };
+  context: StageContext<T>;
   status: 'PENDING' | 'STARTED' | 'COMPLETE' | 'FAILED';
   stages: Stage[];
   logStream: Writable;
@@ -48,11 +45,22 @@ export type Job = {
   error?: Error;
 };
 
-export type Processor = {
-  create(
-    entity: TemplateEntityV1alpha1,
-    values: RequiredTemplateValues & Record<string, JsonValue>,
-  ): Job;
+export interface ProcessorConstructor {
+  new (t: string): Processor;
+}
+
+export interface Processor {
+  create<T = {}>({
+    entity,
+    values,
+    stages,
+  }: {
+    entity: TemplateEntityV1alpha1;
+    values: RequiredTemplateValues & Record<string, JsonValue>;
+    stages: Stage[];
+  }): Job<T>;
 
   get(id: string): Job | undefined;
-};
+}
+
+declare let Processor: ProcessorConstructor;
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/file.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.test.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/file.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.test.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/file.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/file.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/file.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.test.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/github.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.test.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/github.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/github.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/helpers.test.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/helpers.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/helpers.test.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/helpers.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/helpers.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/helpers.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/index.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/index.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/index.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/index.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/preparers.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.test.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/preparers.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.test.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/preparers.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/preparers.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/prepare/types.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/types.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/prepare/types.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/prepare/types.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/helpers.test.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/templater/helpers.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/templater/helpers.test.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/helpers.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/templater/helpers.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/templater/helpers.ts
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/index.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/index.ts
similarity index 100%
rename from plugins/scaffolder-backend/src/scaffolder/templater/index.ts
rename to plugins/scaffolder-backend/src/scaffolder/stages/templater/index.ts