diff --git a/Sources/Executable/Colibri.swift b/Sources/Executable/CLI/Colibri.swift
similarity index 100%
rename from Sources/Executable/Colibri.swift
rename to Sources/Executable/CLI/Colibri.swift
diff --git a/Sources/Executable/Commands/CreateCommand.swift b/Sources/Executable/CLI/Commands/CreateCommand.swift
similarity index 98%
rename from Sources/Executable/Commands/CreateCommand.swift
rename to Sources/Executable/CLI/Commands/CreateCommand.swift
index 12d62a4..f15cca4 100644
--- a/Sources/Executable/Commands/CreateCommand.swift
+++ b/Sources/Executable/CLI/Commands/CreateCommand.swift
@@ -19,8 +19,9 @@ extension Colibri {
 
         mutating func run() async throws {
             let fileService = FileService()
-            let createRootFolder = CreateRootFolderTask(fileService: fileService)
+            
             let createFolders = CreateFoldersTask(fileService: fileService)
+            let createRootFolder = CreateRootFolderTask(fileService: fileService)
 
             let rootFolder = try await createRootFolder(
                 name: options.name,
diff --git a/Sources/Executable/Options/CreateOptions.swift b/Sources/Executable/CLI/Options/CreateOptions.swift
similarity index 100%
rename from Sources/Executable/Options/CreateOptions.swift
rename to Sources/Executable/CLI/Options/CreateOptions.swift