diff --git a/package.json b/package.json
index f0fd691..33bdf74 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "0.5.0",
   "description": "The productive way to build fullstack Nuxt 3 applications, like create-t3-app but for Nuxt.",
   "scripts": {
-    "dev": "vite-node src/",
+    "dev": "vite-node src/ -- --nocounting",
     "dev:ci": "vite-node src/ -- --ci",
     "lint": "eslint \"./src/**/*.{ts,tsx}\" --max-warnings=0",
     "typecheck": "tsc --noEmit",
@@ -51,6 +51,7 @@
     "@nuxt/schema": "^3.0.0",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
+    "consola": "^3.2.3",
     "defu": "^6.1.1",
     "execa": "^6.1.0",
     "giget": "^1.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d533a4..28c5f00 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ dependencies:
   commander:
     specifier: ^9.4.1
     version: 9.5.0
+  consola:
+    specifier: ^3.2.3
+    version: 3.2.3
   defu:
     specifier: ^6.1.1
     version: 6.1.2
@@ -1303,7 +1306,7 @@ packages:
       '@vue/shared': 3.4.21
       entities: 4.5.0
       estree-walker: 2.0.2
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
     dev: true
 
   /@vue/compiler-dom@3.4.21:
@@ -1324,7 +1327,7 @@ packages:
       estree-walker: 2.0.2
       magic-string: 0.30.8
       postcss: 8.4.38
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
     dev: true
 
   /@vue/compiler-ssr@3.4.21:
diff --git a/src/configs/lint/index.ts b/src/configs/eslint.ts
similarity index 86%
rename from src/configs/lint/index.ts
rename to src/configs/eslint.ts
index 7d962f8..4b1a418 100644
--- a/src/configs/lint/index.ts
+++ b/src/configs/eslint.ts
@@ -1,4 +1,4 @@
-import type { PackageConfig } from '../index'
+import type { Config } from '../types'
 
 const eslintConfig = `import antfu from '@antfu/eslint-config'
 
@@ -43,10 +43,7 @@ export default antfu({
 })
 `
 
-const lint: PackageConfig = {
-  type: 'template',
-  humanReadableName: 'ESLint',
-  description: 'Lint your code.',
+const eslint: Config = {
   scripts: [{
     name: 'lint',
     command: 'eslint .'
@@ -68,7 +65,6 @@ const lint: PackageConfig = {
     path: 'eslint.config.js',
     content: eslintConfig
   }],
-  tasksPostInstall: [],
 }
 
-export default lint
+export default eslint
diff --git a/src/steps/4.addCi.ts b/src/configs/github-actions.ts
similarity index 62%
rename from src/steps/4.addCi.ts
rename to src/configs/github-actions.ts
index 260b016..cf16bb3 100644
--- a/src/steps/4.addCi.ts
+++ b/src/configs/github-actions.ts
@@ -1,6 +1,4 @@
-import { mkdir, writeFile } from 'node:fs/promises'
-import { getResolver } from '../utils/getResolver'
-import type { Preferences } from '../prompts'
+import type { Config } from '../types'
 
 const GITHUB_ACTIONS_TEMPLATE = `
 name: CI
@@ -57,14 +55,14 @@ jobs:
   # TODO: Add more steps here, like "nr test" as you add the tooling for it
 `
 
-export default async (preferences: Preferences, templateDir: string) => {
-  // Cheviot already has github actions by default
-  if (preferences.setStack === 'cheviot') {
-    return
-  }
-
-  const resolver = getResolver(templateDir)
-
-  await mkdir(resolver('.github/workflows'), { recursive: true })
-  await writeFile(resolver('.github/workflows/ci.yaml'), GITHUB_ACTIONS_TEMPLATE)
+const githubActions: Config = {
+  scripts: [],
+  dependencies: [],
+  nuxtConfig: {},
+  files: [{
+    path: '.github/workflows/ci.yaml',
+    content: GITHUB_ACTIONS_TEMPLATE
+  }],
 }
+
+export default githubActions
diff --git a/src/configs/index.ts b/src/configs/index.ts
index 28f43b4..0201748 100644
--- a/src/configs/index.ts
+++ b/src/configs/index.ts
@@ -1,40 +1,23 @@
-import type { NuxtConfig } from '@nuxt/schema'
-import type { Dependency, Script } from '../utils/addPackageDependency'
-import prisma from './prisma'
-import auth from './auth'
-import trpc from './trpc'
+import type { Config, ModuleConfig } from '../types'
 import tailwind from './tailwind'
 import naiveui from './naiveui'
-import lint from './lint'
-
-export declare interface File {
-  path: string
-  content: string
-}
+import prisma from './prisma'
+import trpc from './trpc'
+import sidebaseAuth from './sidebase-auth'
+import eslint from './eslint'
+import githubActions from './github-actions'
 
-export declare interface PackageConfig {
-  type: 'module' | 'template'
-  humanReadableName: string
-  description: string
-  dependencies: Dependency[]
-  scripts: Script[]
-  nuxtConfig: NuxtConfig
-  files: File[]
-  tasksPostInstall: string[]
-  indexVue?: {
-    html: string
-    css?: string
-    js?: string
-  }
+export type Modules = 'prisma' | 'sidebase-auth' | 'trpc' | 'tailwind' | 'naiveui'
+export const modules: Record<Modules, ModuleConfig> = {
+  'tailwind': tailwind,
+  'naiveui': naiveui,
+  'prisma': prisma,
+  'trpc': trpc,
+  'sidebase-auth': sidebaseAuth
 }
 
-// Package options
-export type Packages = 'prisma' | 'auth' | 'trpc' | 'tailwind' | 'naiveui' | 'lint'
-export const packageConfigs: Record<Packages, PackageConfig> = {
-  prisma,
-  auth,
-  trpc,
-  tailwind,
-  naiveui,
-  lint
+export type Configs = 'eslint' | 'github-actions'
+export const configs: Record<Configs, Config> = {
+  'eslint': eslint,
+  'github-actions': githubActions
 }
diff --git a/src/configs/naiveui/index.ts b/src/configs/naiveui.ts
similarity index 90%
rename from src/configs/naiveui/index.ts
rename to src/configs/naiveui.ts
index 64b8068..a0c1c16 100644
--- a/src/configs/naiveui/index.ts
+++ b/src/configs/naiveui.ts
@@ -1,5 +1,5 @@
-import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../../generators/generateModuleComponents'
-import type { PackageConfig } from '../index'
+import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../generators/generateModuleComponents'
+import type { ModuleConfig } from '../types'
 
 const naiveDemoComponent = `<script setup lang="ts">
 const showModal = ref(false)
@@ -27,8 +27,7 @@ const showModal = ref(false)
 </template>
 `
 
-const naiveui: PackageConfig = {
-  type: 'module',
+const naiveui: ModuleConfig = {
   humanReadableName: 'Naive UI',
   description: 'A Vue 3 Component Library. Complete, Customizable, Uses TypeScript, Fast. See more: https://www.naiveui.com/',
   scripts: [],
diff --git a/src/configs/prisma/index.ts b/src/configs/prisma.ts
similarity index 96%
rename from src/configs/prisma/index.ts
rename to src/configs/prisma.ts
index 21477b6..d30c447 100644
--- a/src/configs/prisma/index.ts
+++ b/src/configs/prisma.ts
@@ -1,5 +1,5 @@
-import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../../generators/generateModuleComponents'
-import type { PackageConfig } from '../index'
+import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../generators/generateModuleComponents'
+import type { ModuleConfig } from '../types'
 
 const prismaFile = `// This is your Prisma schema file,
 // learn more about it in the docs: https://pris.ly/d/prisma-schema
@@ -101,8 +101,7 @@ const { data: examples } = useFetch('/api/examples')
 </template>
 `
 
-const prisma: PackageConfig = {
-  type: 'module',
+const prisma: ModuleConfig = {
   humanReadableName: 'Prisma ORM',
   description: 'Next-generation Node.js and TypeScript ORM. See more: https://www.prisma.io/',
   scripts: [],
diff --git a/src/configs/auth/index.ts b/src/configs/sidebase-auth.ts
similarity index 96%
rename from src/configs/auth/index.ts
rename to src/configs/sidebase-auth.ts
index 1e7e3ad..ea47f74 100644
--- a/src/configs/auth/index.ts
+++ b/src/configs/sidebase-auth.ts
@@ -1,5 +1,5 @@
-import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../../generators/generateModuleComponents'
-import type { PackageConfig } from '../index'
+import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../generators/generateModuleComponents'
+import type { ModuleConfig } from '../types'
 
 const nuxtAuthServerFile = `import CredentialsProvider from 'next-auth/providers/credentials'
 import GithubProvider from 'next-auth/providers/github'
@@ -79,8 +79,7 @@ const { status, data, signIn, signOut } = useAuth()
 </template>
 `
 
-const auth: PackageConfig = {
-  type: 'module',
+const sidebaseAuth: ModuleConfig = {
   humanReadableName: 'nuxt-auth',
   description: 'Authentication via OAuth, Credentials and magic email flows. Wraps the popular NextAuth.js with 12k stars. See more: https://sidebase.io/nuxt-auth',
   scripts: [],
@@ -114,4 +113,4 @@ const auth: PackageConfig = {
   indexVue: generateModuleHTMLSnippet('WelcomeAuthDemo'),
 }
 
-export default auth
+export default sidebaseAuth
diff --git a/src/configs/tailwind/index.ts b/src/configs/tailwind.ts
similarity index 87%
rename from src/configs/tailwind/index.ts
rename to src/configs/tailwind.ts
index c52f256..491634e 100644
--- a/src/configs/tailwind/index.ts
+++ b/src/configs/tailwind.ts
@@ -1,5 +1,5 @@
-import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../../generators/generateModuleComponents'
-import type { PackageConfig } from '../index'
+import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../generators/generateModuleComponents'
+import type { ModuleConfig } from '../types'
 
 const tailwindDemoComponent = `<template>
   ${generateModuleHTMLComponent(
@@ -14,8 +14,7 @@ const tailwindDemoComponent = `<template>
 </template>
 `
 
-const tailwind: PackageConfig = {
-  type: 'module',
+const tailwind: ModuleConfig = {
   humanReadableName: 'Tailwind CSS',
   description: 'A utility-first CSS framework packed with classes that can be composed to build any design, directly in your markup. See more: https://tailwindcss.com/',
   scripts: [],
diff --git a/src/configs/trpc/index.ts b/src/configs/trpc.ts
similarity index 96%
rename from src/configs/trpc/index.ts
rename to src/configs/trpc.ts
index a06fdf0..200fbe2 100644
--- a/src/configs/trpc/index.ts
+++ b/src/configs/trpc.ts
@@ -1,5 +1,5 @@
-import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../../generators/generateModuleComponents'
-import type { PackageConfig } from '../index'
+import { generateModuleHTMLComponent, generateModuleHTMLSnippet } from '../generators/generateModuleComponents'
+import type { ModuleConfig } from '../types'
 
 const nuxtTrpcRootConfig = `/**
  * This is your entry point to setup the root configuration for tRPC on the server.
@@ -125,8 +125,7 @@ const hello = await $client.hello.useQuery({ text: 'client' })
 </template>
 `
 
-const trpc: PackageConfig = {
-  type: 'module',
+const trpc: ModuleConfig = {
   humanReadableName: 'tRPC 10',
   description: 'Build end-to-end typesafe APIs in Nuxt applications. See more: https://trpc.io/',
   scripts: [],
diff --git a/src/utils/getResolver.ts b/src/getResolver.ts
similarity index 100%
rename from src/utils/getResolver.ts
rename to src/getResolver.ts
diff --git a/src/index.ts b/src/index.ts
index e10a997..323a8f0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,35 +1,35 @@
 #!/usr/bin/env node
-import { addCi, addModules, addReadme, downloadTemplate, initGit, npmInstall } from './steps'
-import { sayGoodbye, sayQuickWelcome, saySetupIsRunning, sayWelcome } from './messages'
+import { errorMessage, sayGoodbye, sayQuickWelcome, saySetupIsRunning, sayWelcome, wrapInSpinner } from './messages'
+import type { Preferences } from './types'
 import { getUserPreferences } from './prompts'
-import { wrapInSpinner } from './utils/spinner'
-import { getUserPkgManager } from './utils/getUserPkgManager'
+import { logTelemetry } from './utils/logTelemetry'
 import { cliOptions } from './utils/parseCliOptions'
-import { count } from './utils/count'
+import { addReadMe, buildNuxtConfig, buildPackage, downloadTemplate, getConfigs, initGit, install, writeFiles } from './steps'
+import { getUserPkgManager } from './utils/getUserPkgManager'
 
 async function main() {
   const { quick, ci } = cliOptions
+
+  // Welcome the User
   if (!quick) {
     await sayWelcome()
   }
   else {
-    sayQuickWelcome()
+    await sayQuickWelcome()
   }
 
-  let preferences
+  // Collect User preferences
+  let preferences: Preferences = {
+    setProjectName: 'my-sidebase-app',
+    setStack: 'merino',
+    addModules: ['prisma', 'sidebase-auth', 'trpc', 'tailwind', 'naiveui'],
+    runGitInit: true,
+    addCi: 'github',
+    runInstall: true
+  }
   if (!ci) {
     preferences = await getUserPreferences()
-    count(preferences)
-  }
-  else {
-    preferences = {
-      setProjectName: 'my-sidebase-app',
-      setStack: 'merino',
-      addModules: ['prisma', 'auth', 'trpc', 'tailwind', 'naiveui'],
-      runGitInit: true,
-      addCi: 'github',
-      runInstall: true
-    }
+    logTelemetry(preferences)
   }
 
   if (!quick) {
@@ -39,42 +39,35 @@ async function main() {
   // 1. Download the Nuxt 3 template
   const template = await wrapInSpinner(`Adding Nuxt 3 ${preferences.setStack}-template`, downloadTemplate, preferences)
 
-  // 2. Add modules
-  if (preferences.setStack === 'merino') {
-    await wrapInSpinner('Adding Nuxt modules', addModules, preferences, template.dir)
-  }
+  // 2. Get Configs and modules
+  const { configs, modules } = getConfigs(preferences)
+
+  // 3. Build `package.json`
+  await wrapInSpinner('Building `package.json`', buildPackage, template.dir, configs, modules)
 
-  // 4. Initialize git
+  // 4. Build `nuxt.config.ts`
+  await wrapInSpinner('Building `nuxt.config.ts`', buildNuxtConfig, template.dir, configs, modules)
+
+  // 5. Write files
+  await wrapInSpinner('Writing files', writeFiles, template.dir, configs, modules)
+
+  // 6. Initialize git
   if (preferences.runGitInit) {
     await wrapInSpinner('Running `git init`', initGit, template.dir)
   }
 
-  // 5. Add CI
-  if (preferences.addCi === 'github') {
-    await wrapInSpinner('Adding CI template', addCi, preferences, template.dir)
-  }
-
-  // 6. Run install
+  // 7. Run install
   if (preferences.runInstall) {
-    await wrapInSpinner(`Running \`${getUserPkgManager()} install\``, npmInstall, template.dir)
+    await wrapInSpinner(`Running \`${getUserPkgManager()} install\``, install, template.dir)
   }
 
-  // 7. Write readme
-  await wrapInSpinner('Adding README', addReadme, preferences, template.dir)
+  // 8. Write readme
+  await wrapInSpinner('Adding README', addReadMe, preferences, template.dir)
 
   sayGoodbye(preferences)
 }
 
 main().catch((err) => {
-  console.error('Aborting installation...')
-  if (err instanceof Error) {
-    console.error(err)
-  }
-  else {
-    console.error(
-      'An unknown error has occurred. Please open an issue on github with the below:',
-    )
-    console.log(err)
-  }
+  errorMessage(err)
   process.exit(1)
 })
diff --git a/src/messages.ts b/src/messages.ts
deleted file mode 100644
index 405df86..0000000
--- a/src/messages.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import chalk from 'chalk'
-import type { Preferences } from './prompts'
-import { getUserPkgManager } from './utils/getUserPkgManager'
-import { getVersion } from './utils/getVersion'
-
-const diamond = chalk.bold.gray('🐑 Diamond:').padEnd(12, ' ') // Make `diamond` fixed sized -> emojis can habe surprising lengths
-
-export function say(message: string) {
-  console.log(diamond)
-  console.log(message)
-}
-
-// Artist of sheep: Bob Allison, taken from https://ascii.co.uk/art/sheep on 17.12.2022
-function makeBanner(welcome: string) {
-  return `
-        __  _
-    .-.'  \`; \`-._  __  _
-   (_,         .-:'  \`; \`-._
- ,'o"(        (_,           )
-(__,-'      ,'o"(            )>
-   (       (__,-'            )
-    \`-'._.--._(             )
-       |||  |||\`-'._.--._.-'
-                  |||  |||
-${diamond}
-${welcome}
-`
-}
-
-export async function sayWelcome() {
-  const version = await getVersion()
-  const welcome = `Welcome to ${chalk.green(`sidebase v${version}`)}!`
-  const banner = makeBanner(welcome)
-  console.log(banner)
-
-  say(`sidebase helps you to create fully typesafe Nuxt 3 app in seconds: ${chalk.blue('https://sidebase.io/sidebase')} \n`)
-
-  say('Let\'s get started:')
-}
-
-export async function sayQuickWelcome() {
-  const welcome = `Welcome to ${chalk.green('sidebase')} (${chalk.blue('https://sidebase.io/sidebase')})! Thanks for choosing the warp route:`
-  const banner = makeBanner(welcome)
-  console.log(banner)
-}
-
-export function saySetupIsRunning(preferences: Preferences) {
-  console.log()
-  say(`Now setting up ${chalk.green(preferences.setProjectName)}:`)
-}
-
-function sayCommand(command: string, comment = '') {
-  const coloredCommand = chalk.blue(`> ${command}`)
-  if (comment.length > 0) {
-    const coloredComment = chalk.gray(`// ${comment}`)
-
-    // pad command to have unified length for all logging output
-    const assembledLine = `${coloredCommand.padEnd(40, ' ')} ${coloredComment}`
-    console.log(assembledLine)
-  }
-  else {
-    console.log(coloredCommand)
-  }
-}
-
-export function sayGoodbye(preferences: Preferences) {
-  console.log()
-  console.log(diamond)
-  console.log('✨ Project setup finished. Next steps are:')
-
-  sayCommand(`cd ${preferences.setProjectName}`, 'Enter your project directory')
-
-  const packageManager = getUserPkgManager()
-  if (!preferences.runInstall) {
-    sayCommand(`${packageManager} install`, 'Install project dependencies')
-  }
-
-  if (preferences.addModules?.includes('prisma') || preferences.setStack === 'cheviot') {
-    sayCommand('npx prisma db push', 'Initialize the database & Prisma client')
-  }
-
-  sayCommand(`${packageManager} run dev`, 'Start the development server, use CTRL+C to stop')
-
-  console.log(`\nStuck? Join us at ${chalk.blue('https://discord.gg/auc8eCeGzx')}\n`)
-  console.log(`🐑 So Long, and Thanks for ... using ${chalk.green('sidebase')} to setup your application`)
-}
diff --git a/src/messages/goodbye.ts b/src/messages/goodbye.ts
new file mode 100644
index 0000000..c4e4dbd
--- /dev/null
+++ b/src/messages/goodbye.ts
@@ -0,0 +1,40 @@
+import chalk from 'chalk'
+import type { Preferences } from '../types'
+import { getUserPkgManager } from '../utils/getUserPkgManager'
+import { diamond } from '.'
+
+function sayCommand(command: string, comment = '') {
+  const coloredCommand = chalk.blue(`> ${command}`)
+  if (comment.length > 0) {
+    const coloredComment = chalk.gray(`// ${comment}`)
+
+    // pad command to have unified length for all logging output
+    const assembledLine = `${coloredCommand.padEnd(40, ' ')} ${coloredComment}`
+    console.log(assembledLine)
+  }
+  else {
+    console.log(coloredCommand)
+  }
+}
+
+export function sayGoodbye(preferences: Preferences) {
+  console.log()
+  console.log(diamond)
+  console.log('✨ Project setup finished. Next steps are:')
+
+  sayCommand(`cd ${preferences.setProjectName}`, 'Enter your project directory')
+
+  const packageManager = getUserPkgManager()
+  if (!preferences.runInstall) {
+    sayCommand(`${packageManager} install`, 'Install project dependencies')
+  }
+
+  if (preferences.addModules?.includes('prisma') || preferences.setStack === 'cheviot') {
+    sayCommand('npx prisma db push', 'Initialize the database & Prisma client')
+  }
+
+  sayCommand(`${packageManager} run dev`, 'Start the development server, use CTRL+C to stop')
+
+  console.log(`\nStuck? Join us at ${chalk.blue('https://discord.gg/auc8eCeGzx')}\n`)
+  console.log(`🐑 So Long, and Thanks for ... using ${chalk.green('sidebase')} to setup your application`)
+}
diff --git a/src/messages/index.ts b/src/messages/index.ts
new file mode 100644
index 0000000..354abcf
--- /dev/null
+++ b/src/messages/index.ts
@@ -0,0 +1,24 @@
+import chalk from 'chalk'
+import { consola } from 'consola'
+import type { Preferences } from '../../srcOLD/prompts'
+
+export { sayWelcome, sayQuickWelcome } from './welcome'
+export { sayGoodbye } from './goodbye'
+export { wrapInSpinner } from './spinner'
+
+// Diamond config
+export const diamond = chalk.bold.gray('🐑 Diamond:').padEnd(12, ' ') // Make `diamond` fixed sized -> emojis can habe surprising lengths
+export function say(message: string) {
+  console.log(diamond)
+  consola.info(message)
+}
+
+export function saySetupIsRunning(preferences: Preferences) {
+  console.log()
+  say(`Now setting up ${chalk.green(preferences.setProjectName)}:`)
+}
+
+export function errorMessage(error: any, message?: string) {
+  consola.error(message || 'Aborting installation... An error has occurred. Please open an issue on github with the below:')
+  consola.box(error)
+}
diff --git a/src/utils/spinner.ts b/src/messages/spinner.ts
similarity index 100%
rename from src/utils/spinner.ts
rename to src/messages/spinner.ts
diff --git a/src/messages/welcome.ts b/src/messages/welcome.ts
new file mode 100644
index 0000000..d60defb
--- /dev/null
+++ b/src/messages/welcome.ts
@@ -0,0 +1,37 @@
+import chalk from 'chalk'
+import { consola } from 'consola'
+import { getVersion } from '../utils/getVersion'
+import { diamond, say } from '.'
+
+// Artist of sheep: Bob Allison, taken from https://ascii.co.uk/art/sheep on 17.12.2022
+function makeBanner(welcome: string) {
+  return `
+        __  _
+    .-.'  \`; \`-._  __  _
+   (_,         .-:'  \`; \`-._
+ ,'o"(        (_,           )
+(__,-'      ,'o"(            )>
+   (       (__,-'            )
+    \`-'._.--._(             )
+       |||  |||\`-'._.--._.-'
+                  |||  |||
+${diamond}
+${welcome}
+`
+}
+export async function sayWelcome() {
+  const version = await getVersion()
+  const welcome = `Welcome to ${chalk.green(`create-sidebase v${version}`)}!`
+  const banner = makeBanner(welcome)
+
+  console.log(banner)
+
+  say(`sidebase helps you to create fully typesafe Nuxt 3 app in seconds: ${chalk.blueBright('https://sidebase.io/sidebase')} \n`)
+
+  say('Let\'s get started:')
+}
+
+export async function sayQuickWelcome() {
+  const version = await getVersion()
+  consola.info(`Welcome to ${chalk.green(`create-sidebase v${version}`)} (${chalk.blueBright('https://sidebase.io/sidebase')})! Thanks for choosing the warp route:`)
+}
diff --git a/src/prompts.ts b/src/prompts.ts
index 0e20671..f2f1a7a 100644
--- a/src/prompts.ts
+++ b/src/prompts.ts
@@ -1,11 +1,16 @@
 import prompts from 'prompts'
 import type { PromptObject, PromptType } from 'prompts'
 import { say } from './messages'
-import { packageConfigs } from './configs/index'
 import { getUserPkgManager } from './utils/getUserPkgManager'
 import { getRandomProjectNoun } from './utils/getRandomProjectNoun'
+import type { Preferences, Stack } from './types'
+import { modules } from './configs'
 
-const skipIfCheviotWasChosen = (typeIfNotMerino: PromptType) => (_: unknown, preferences: Record<string, string>) => preferences.setStack === 'cheviot' ? null : typeIfNotMerino
+function skipIf(stacksToSkip: Stack[], promptType: PromptType) {
+  return (_: unknown, preferences: Record<string, string>) => {
+    return stacksToSkip.includes(preferences.setStack as Stack) ? null : promptType
+  }
+}
 
 const PROMPT_QUESTIONS: PromptObject[] = [
   {
@@ -25,10 +30,11 @@ const PROMPT_QUESTIONS: PromptObject[] = [
     initial: 0
   },
   {
-    type: skipIfCheviotWasChosen('multiselect'),
+    type: skipIf(['cheviot'], 'multiselect'),
     name: 'addModules',
     message: 'Which modules would you like to use?',
-    choices: Object.entries(packageConfigs).filter(([, { type }]) => type === 'module').map(([key, { humanReadableName, description }]) => ({ title: humanReadableName, description, value: key }))
+    choices: Object.entries(modules).map((
+      [key, { humanReadableName, description }]) => ({ title: humanReadableName, description, value: key }))
   },
   {
     type: 'confirm',
@@ -37,7 +43,7 @@ const PROMPT_QUESTIONS: PromptObject[] = [
     initial: true,
   },
   {
-    type: skipIfCheviotWasChosen('select'),
+    type: skipIf(['cheviot'], 'select'),
     name: 'addCi',
     message: 'Initialize a default CI pipeline?',
     choices: [
@@ -62,5 +68,4 @@ function onCancel() {
   process.exit()
 }
 
-export const getUserPreferences = () => prompts(PROMPT_QUESTIONS, { onCancel })
-export type Preferences = Awaited<ReturnType<typeof getUserPreferences>>
+export const getUserPreferences = () => prompts(PROMPT_QUESTIONS, { onCancel }) as Promise<Preferences>
diff --git a/src/steps/1.downloadTemplate.ts b/src/steps/1.downloadTemplate.ts
index fd977b2..687e067 100644
--- a/src/steps/1.downloadTemplate.ts
+++ b/src/steps/1.downloadTemplate.ts
@@ -1,11 +1,6 @@
-import { mkdir, writeFile } from 'node:fs/promises'
-import path from 'node:path'
 import { downloadTemplate } from 'giget'
-import type { Preferences } from '../prompts'
 import { say } from '../messages'
-import { packageConfigs } from '../configs'
-import { addPackageDependencies, addPackageScripts } from '../utils/addPackageDependency'
-import { getResolver } from '../utils/getResolver'
+import type { Preferences } from '../types'
 
 const KNOWN_TEMPLATES = {
   merino: 'github:nuxt/starter#v3',
@@ -30,28 +25,5 @@ export default async (preferences: Preferences) => {
     process.exit()
   }
 
-  // 2. Add missing dependencies
-  const packages = Object.values(packageConfigs).filter(({ type }) => type === 'template')
-  const dependencies = packages.flatMap(({ dependencies }) => dependencies)
-  const scripts = packages.flatMap(({ scripts }) => scripts)
-
-  await addPackageDependencies({
-    projectDir: preferences.setProjectName,
-    dependencies
-  })
-  await addPackageScripts({
-    projectDir: preferences.setProjectName,
-    scripts,
-  })
-
-  // 3. Add extra files
-  const resolver = getResolver(template.dir)
-  const files = packages.flatMap(({ files }) => files)
-  for (const file of files) {
-    const folder = path.dirname(file.path)
-    await mkdir(resolver(folder), { recursive: true })
-    await writeFile(resolver(file.path), file.content)
-  }
-
   return template
 }
diff --git a/src/steps/2.addModules.ts b/src/steps/2.addModules.ts
deleted file mode 100644
index 085e067..0000000
--- a/src/steps/2.addModules.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { mkdir, writeFile } from 'node:fs/promises'
-import path from 'node:path'
-import { inspect } from 'node:util'
-import type { NuxtConfig } from '@nuxt/schema'
-import defu from 'defu'
-import { getResolver } from '../utils/getResolver'
-import type { Preferences } from '../prompts'
-import type { File, Packages } from '../configs/index'
-import { packageConfigs } from '../configs/index'
-import type { Dependency } from '../utils/addPackageDependency'
-import { addPackageDependencies } from '../utils/addPackageDependency'
-import { generateIndexVue } from '../generators/generateIndexVue'
-import { buttonLink } from '../generators/generateModuleComponents'
-
-export default async (preferences: Preferences, templateDir: string) => {
-  const selectedModules: Packages[] = preferences.addModules || []
-  const resolver = getResolver(templateDir)
-
-  // 1. Gather module configuration for all selected modules
-  let dependencies: Dependency[] = []
-  let nuxtConfigExtensions: NuxtConfig[] = []
-  let files: File[] = []
-
-  for (const selectedModule of selectedModules) {
-    dependencies = [...dependencies, ...packageConfigs[selectedModule].dependencies]
-    nuxtConfigExtensions = nuxtConfigExtensions.concat(packageConfigs[selectedModule].nuxtConfig)
-    files = files.concat(packageConfigs[selectedModule].files)
-  }
-
-  // 2. Add required dependencies to `package.json`
-  await addPackageDependencies({
-    projectDir: preferences.setProjectName,
-    dependencies
-  })
-
-  // 3. Add extra files for modules that need it
-  for (const file of files) {
-    const folder = path.dirname(file.path)
-    await mkdir(resolver(folder), { recursive: true })
-    await writeFile(resolver(file.path), file.content)
-  }
-
-  // 4. Write nuxt config
-  let nuxtConfig = {
-    typescript: {
-      shim: false,
-    },
-  }
-  for (const nuxtConfigExtension of nuxtConfigExtensions) {
-    nuxtConfig = defu(nuxtConfig, nuxtConfigExtension)
-  }
-  const nuxtConfigFile = `// https://nuxt.com/docs/api/configuration/nuxt-config
-export default defineNuxtConfig(${inspect(nuxtConfig, { compact: false })})
-`
-  await writeFile(resolver('nuxt.config.ts'), nuxtConfigFile)
-
-  // 5. Write app.vue to ensure that sub-example-pages of different modules will work
-  const nuxtAppVue = `<template>
-  <div>
-    <NuxtPage />
-  </div>
-</template>
-`
-  await writeFile(resolver('app.vue'), nuxtAppVue)
-
-  // 6. Write index.vue with a nice welcome message as well as links to sub-pages
-  const nuxtPagesIndexVue = generateIndexVue(selectedModules)
-  await mkdir(resolver('pages'), { recursive: true })
-  await writeFile(resolver('pages/index.vue'), nuxtPagesIndexVue)
-
-  // 7. Write ButtonLink.vue for the module components
-  if (selectedModules.length > 0) {
-    await mkdir(resolver('components/Welcome'), { recursive: true })
-    await writeFile(resolver('components/Welcome/ButtonLink.vue'), buttonLink)
-  }
-}
diff --git a/src/steps/2.getConfigs.ts b/src/steps/2.getConfigs.ts
new file mode 100644
index 0000000..5bceb0d
--- /dev/null
+++ b/src/steps/2.getConfigs.ts
@@ -0,0 +1,24 @@
+import type { Config, Preferences } from '../types'
+import { configs, modules } from '../configs'
+
+export default function (preferences: Preferences) {
+  const setConfigs: Config[] = []
+
+  // 1. Check if stack is not cheviot
+  if (preferences.setStack === 'cheviot') {
+    return { configs: [], modules: [] }
+  }
+
+  // 2. Add Github Actions CI, if enabled
+  if (preferences.addCi === 'github') {
+    setConfigs.push(configs['github-actions'])
+  }
+
+  // 3. Add Eslint configs
+  setConfigs.push(configs.eslint)
+
+  // 4. Get Modules
+  const setModules = preferences.addModules?.map(key => modules[key]) ?? []
+
+  return { configs: setConfigs, modules: setModules }
+}
diff --git a/src/steps/3.buildPackage.ts b/src/steps/3.buildPackage.ts
new file mode 100644
index 0000000..d3cf9b7
--- /dev/null
+++ b/src/steps/3.buildPackage.ts
@@ -0,0 +1,35 @@
+import type { Config, Dependency, ModuleConfig, Script } from '../types'
+import { addPackageDependencies } from '../utils/package/addPackageDependency'
+import { addPackageScripts } from '../utils/package/addPackageScript'
+
+export default async function (templateDir: string, configs: Config[], modules: ModuleConfig[]) {
+  // If no configs or modules were passed, skip.
+  if (configs.length === 0 && modules.length === 0) {
+    return
+  }
+
+  const dependenciesToAdd: Dependency[] = []
+  const scriptsToAdd: Script[] = []
+
+  // 1. Collect all dependencies
+  configs.forEach(({ dependencies, scripts }) => {
+    dependenciesToAdd.push(...dependencies)
+    scriptsToAdd.push(...scripts)
+  })
+  modules.forEach(({ dependencies, scripts }) => {
+    dependenciesToAdd.push(...dependencies)
+    scriptsToAdd.push(...scripts)
+  })
+
+  // 2. Add the dependencies to the `package.json`
+  addPackageDependencies({
+    projectDir: templateDir,
+    dependencies: dependenciesToAdd
+  })
+
+  // 3. Add the scripts to the `package.json`
+  addPackageScripts({
+    projectDir: templateDir,
+    scripts: scriptsToAdd
+  })
+}
diff --git a/src/steps/4.buildNuxtConfig.ts b/src/steps/4.buildNuxtConfig.ts
new file mode 100644
index 0000000..4db7a20
--- /dev/null
+++ b/src/steps/4.buildNuxtConfig.ts
@@ -0,0 +1,34 @@
+import { writeFile } from 'node:fs/promises'
+import { inspect } from 'node:util'
+import type { NuxtConfig } from '@nuxt/schema'
+import defu from 'defu'
+import type { Config, ModuleConfig } from '../types'
+import { getResolver } from '../getResolver'
+
+export default async function (templateDir: string, configs: Config[], modules: ModuleConfig[]) {
+  // If no configs or modules were passed, skip.
+  if (configs.length === 0 && modules.length === 0) {
+    return
+  }
+
+  const resolver = getResolver(templateDir)
+  const nuxtConfigExtensions: NuxtConfig[] = []
+
+  // 1. Collect Nuxt Config extensions
+  configs.forEach(({ nuxtConfig }) => nuxtConfigExtensions.push(nuxtConfig))
+  modules.forEach(({ nuxtConfig }) => nuxtConfigExtensions.push(nuxtConfig))
+
+  // 2. Build base Nuxt Config
+  let nuxtConfig = {
+    typescript: {
+      shim: false,
+    },
+  }
+  for (const nuxtConfigExtension of nuxtConfigExtensions) {
+    nuxtConfig = defu(nuxtConfig, nuxtConfigExtension)
+  }
+  const nuxtConfigFile = `// https://nuxt.com/docs/api/configuration/nuxt-config
+export default defineNuxtConfig(${inspect(nuxtConfig, { compact: false })})
+`
+  await writeFile(resolver('nuxt.config.ts'), nuxtConfigFile)
+}
diff --git a/src/steps/5.writeFiles.ts b/src/steps/5.writeFiles.ts
new file mode 100644
index 0000000..ff53faa
--- /dev/null
+++ b/src/steps/5.writeFiles.ts
@@ -0,0 +1,47 @@
+import { mkdir, writeFile } from 'node:fs/promises'
+import path from 'node:path'
+import type { Config, File, ModuleConfig } from '../types'
+import { getResolver } from '../getResolver'
+import { generateIndexVue } from '../generators/generateIndexVue'
+import { buttonLink } from '../generators/generateModuleComponents'
+
+export default async function (templateDir: string, configs: Config[], modules: ModuleConfig[]) {
+  // If no configs or modules were passed, skip.
+  if (configs.length === 0 && modules.length === 0) {
+    return
+  }
+
+  const resolver = getResolver(templateDir)
+  const filesToAdd: File[] = []
+
+  // 1. Collect all Files
+  configs.forEach(({ files }) => filesToAdd.push(...files))
+  modules.forEach(({ files }) => filesToAdd.push(...files))
+
+  // 2. Write files
+  for (const file of filesToAdd) {
+    const folder = path.dirname(file.path)
+    await mkdir(resolver(folder), { recursive: true })
+    await writeFile(resolver(file.path), file.content)
+  }
+
+  // 3. Write app.vue to ensure that sub-example-pages of different modules will work
+  const nuxtAppVue = `<template>
+    <div>
+      <NuxtPage />
+    </div>
+  </template>
+  `
+  await writeFile(resolver('app.vue'), nuxtAppVue)
+
+  // 4. Write index.vue with a nice welcome message as well as links to sub-pages
+  const nuxtPagesIndexVue = generateIndexVue(modules)
+  await mkdir(resolver('pages'), { recursive: true })
+  await writeFile(resolver('pages/index.vue'), nuxtPagesIndexVue)
+
+  // 5. Write ButtonLink.vue for the module components
+  if (modules.length > 0) {
+    await mkdir(resolver('components/Welcome'), { recursive: true })
+    await writeFile(resolver('components/Welcome/ButtonLink.vue'), buttonLink)
+  }
+}
diff --git a/src/steps/3.initGit.ts b/src/steps/6.initGit.ts
similarity index 100%
rename from src/steps/3.initGit.ts
rename to src/steps/6.initGit.ts
diff --git a/src/steps/5.npmInstall.ts b/src/steps/7.install.ts
similarity index 100%
rename from src/steps/5.npmInstall.ts
rename to src/steps/7.install.ts
diff --git a/src/steps/6.addReadme.ts b/src/steps/8.addReadMe.ts
similarity index 88%
rename from src/steps/6.addReadme.ts
rename to src/steps/8.addReadMe.ts
index 9cfebda..ee7d559 100644
--- a/src/steps/6.addReadme.ts
+++ b/src/steps/8.addReadMe.ts
@@ -1,16 +1,15 @@
 import { writeFile } from 'node:fs/promises'
-import { getResolver } from '../utils/getResolver'
-import type { Preferences } from '../prompts'
+import { getResolver } from '../getResolver'
+import type { Preferences } from '../types'
 import { getUserPkgManager } from '../utils/getUserPkgManager'
-import type { Packages } from '../configs'
-import { packageConfigs } from '../configs'
+import { modules } from '../configs'
 
 function makeReadme(preferences: Preferences) {
   const { setProjectName = 'sidebase', setStack = undefined, addModules = [], addCi = 'none' } = preferences
 
   let selectedFeatures = []
   if (setStack === 'merino') {
-    selectedFeatures = addModules.map((module: keyof typeof packageConfigs) => `- ${packageConfigs[module].humanReadableName}`)
+    selectedFeatures = addModules.map((module: keyof typeof modules) => `- ${modules[module].humanReadableName}`)
     if (addCi === 'github') {
       selectedFeatures.push('- GitHub Actions based CI')
     }
@@ -34,7 +33,7 @@ function makeReadme(preferences: Preferences) {
     ]
   }
 
-  const tasksPostInstall = addModules.map((module: Packages) => packageConfigs[module].tasksPostInstall).flat()
+  const tasksPostInstall = addModules.map(module => modules[module].tasksPostInstall).flat()
   const packageManager = getUserPkgManager()
 
   return `# ${setProjectName}-app
diff --git a/src/steps/index.ts b/src/steps/index.ts
index ad74ce4..2455e50 100644
--- a/src/steps/index.ts
+++ b/src/steps/index.ts
@@ -1,8 +1,10 @@
 import downloadTemplate from './1.downloadTemplate'
-import addModules from './2.addModules'
-import initGit from './3.initGit'
-import addCi from './4.addCi'
-import npmInstall from './5.npmInstall'
-import addReadme from './6.addReadme'
+import getConfigs from './2.getConfigs'
+import buildPackage from './3.buildPackage'
+import buildNuxtConfig from './4.buildNuxtConfig'
+import writeFiles from './5.writeFiles'
+import initGit from './6.initGit'
+import install from './7.install'
+import addReadMe from './8.addReadMe'
 
-export { downloadTemplate, addModules, initGit, addCi, npmInstall, addReadme }
+export { downloadTemplate, getConfigs, buildPackage, buildNuxtConfig, writeFiles, initGit, install, addReadMe }
diff --git a/src/types.ts b/src/types.ts
new file mode 100644
index 0000000..7ed148a
--- /dev/null
+++ b/src/types.ts
@@ -0,0 +1,48 @@
+import type { NuxtConfig } from '@nuxt/schema'
+import type { Modules } from './configs'
+
+export type Stack = 'merino' | 'cheviot'
+export interface Preferences {
+  setProjectName: string
+  setStack: Stack
+  addModules?: Modules[]
+  runGitInit: boolean
+  addCi?: 'github'
+  runInstall: boolean
+}
+
+export declare interface File {
+  path: string
+  content: string
+}
+
+export interface Dependency {
+  name: string
+  version: string
+  isDev: boolean
+  isPeer?: boolean
+}
+
+export interface Script {
+  name: string
+  command: string
+}
+
+export interface Config {
+  requiresOn?: string[]
+  dependencies: Dependency[]
+  scripts: Script[]
+  files: File[]
+  nuxtConfig: NuxtConfig
+}
+
+export interface ModuleConfig extends Config {
+  humanReadableName: string
+  description: string
+  tasksPostInstall: string[]
+  indexVue?: {
+    html: string
+    css?: string
+    js?: string
+  }
+}
diff --git a/src/utils/count.ts b/src/utils/logTelemetry.ts
similarity index 95%
rename from src/utils/count.ts
rename to src/utils/logTelemetry.ts
index 4257332..e4c29b5 100644
--- a/src/utils/count.ts
+++ b/src/utils/logTelemetry.ts
@@ -10,7 +10,7 @@ import { cliOptions } from './parseCliOptions'
  * No identifiably information (such as project name, IP, user-agent) is transmitted in the process. You can opt out by passing `--nocounting` to the CLI on invocation.
  */
 let alreadyCounted = false
-export async function count(preferences: Preferences) {
+export async function logTelemetry(preferences: Preferences) {
   if (alreadyCounted || process.env.NODE_ENV === 'development' || cliOptions.nocounting) {
     return
   }
diff --git a/src/utils/addPackageDependency.ts b/src/utils/package/addPackageDependency.ts
similarity index 59%
rename from src/utils/addPackageDependency.ts
rename to src/utils/package/addPackageDependency.ts
index 328c19a..a3a1b4a 100644
--- a/src/utils/addPackageDependency.ts
+++ b/src/utils/package/addPackageDependency.ts
@@ -1,18 +1,7 @@
 import { resolve } from 'node:path'
 import { readPackageJSON, writePackageJSON } from 'pkg-types'
 import { defu } from 'defu'
-
-export interface Dependency {
-  name: string
-  version: string
-  isDev: boolean
-  isPeer?: boolean
-}
-
-export interface Script {
-  name: string
-  command: string
-}
+import type { Dependency } from '../../types'
 
 export async function addPackageDependencies(opts: {
   dependencies: Dependency[]
@@ -43,21 +32,3 @@ export async function addPackageDependencies(opts: {
 
   await writePackageJSON(pathToPackageJson, packageJson)
 }
-
-export async function addPackageScripts(opts: {
-  scripts: Script[]
-  projectDir: string
-}) {
-  const { projectDir, scripts } = opts
-
-  const pathToPackageJson = resolve(`./${projectDir}/package.json`)
-  const packageJson = await readPackageJSON(pathToPackageJson)
-
-  for (const { name, command } of scripts) {
-    packageJson.scripts = defu(packageJson.scripts, {
-      [name]: command
-    })
-  }
-
-  await writePackageJSON(pathToPackageJson, packageJson)
-}
diff --git a/src/utils/package/addPackageScript.ts b/src/utils/package/addPackageScript.ts
new file mode 100644
index 0000000..d5cf14f
--- /dev/null
+++ b/src/utils/package/addPackageScript.ts
@@ -0,0 +1,22 @@
+import { resolve } from 'node:path'
+import { readPackageJSON, writePackageJSON } from 'pkg-types'
+import { defu } from 'defu'
+import type { Script } from '../../types'
+
+export async function addPackageScripts(opts: {
+  scripts: Script[]
+  projectDir: string
+}) {
+  const { projectDir, scripts } = opts
+
+  const pathToPackageJson = resolve(`./${projectDir}/package.json`)
+  const packageJson = await readPackageJSON(pathToPackageJson)
+
+  for (const { name, command } of scripts) {
+    packageJson.scripts = defu(packageJson.scripts, {
+      [name]: command
+    })
+  }
+
+  await writePackageJSON(pathToPackageJson, packageJson)
+}