diff --git a/src/base_authentication_app_skeleton/src/operations/mixins/password_validations.cr b/src/base_authentication_app_skeleton/src/operations/mixins/password_validations.cr.ecr
similarity index 100%
rename from src/base_authentication_app_skeleton/src/operations/mixins/password_validations.cr
rename to src/base_authentication_app_skeleton/src/operations/mixins/password_validations.cr.ecr
diff --git a/src/base_authentication_app_skeleton/src/operations/mixins/user_from_email.cr b/src/base_authentication_app_skeleton/src/operations/mixins/user_from_email.cr.ecr
similarity index 100%
rename from src/base_authentication_app_skeleton/src/operations/mixins/user_from_email.cr
rename to src/base_authentication_app_skeleton/src/operations/mixins/user_from_email.cr.ecr
diff --git a/src/base_authentication_app_skeleton/src/operations/request_password_reset.cr b/src/base_authentication_app_skeleton/src/operations/request_password_reset.cr.ecr
similarity index 100%
rename from src/base_authentication_app_skeleton/src/operations/request_password_reset.cr
rename to src/base_authentication_app_skeleton/src/operations/request_password_reset.cr.ecr
diff --git a/src/base_authentication_app_skeleton/src/operations/reset_password.cr b/src/base_authentication_app_skeleton/src/operations/reset_password.cr.ecr
similarity index 100%
rename from src/base_authentication_app_skeleton/src/operations/reset_password.cr
rename to src/base_authentication_app_skeleton/src/operations/reset_password.cr.ecr
diff --git a/src/base_authentication_app_skeleton/src/operations/sign_in_user.cr b/src/base_authentication_app_skeleton/src/operations/sign_in_user.cr.ecr
similarity index 100%
rename from src/base_authentication_app_skeleton/src/operations/sign_in_user.cr
rename to src/base_authentication_app_skeleton/src/operations/sign_in_user.cr.ecr
diff --git a/src/base_authentication_app_skeleton/src/operations/sign_up_user.cr b/src/base_authentication_app_skeleton/src/operations/sign_up_user.cr.ecr
similarity index 100%
rename from src/base_authentication_app_skeleton/src/operations/sign_up_user.cr
rename to src/base_authentication_app_skeleton/src/operations/sign_up_user.cr.ecr
diff --git a/src/generators/web.cr b/src/generators/web.cr
index b4733e47..415e45d7 100644
--- a/src/generators/web.cr
+++ b/src/generators/web.cr
@@ -1,5 +1,3 @@
-require "option_parser"
-
 class LuckyCli::Generators::Web
   include LuckyCli::GeneratorHelpers
 
@@ -45,13 +43,9 @@ class LuckyCli::Generators::Web
 
   def run : Nil
     ensure_directory_does_not_exist
-    generate_default_crystal_project
-    rename_shard_target_to_app
-    add_deps_to_shard_file
-    add_dev_deps_to_shard_file
-    remove_generated_src_files
-    remove_generated_spec_files
-    remove_default_readme
+    generate_default_project
+    generate_shard_yml
+
     add_default_lucky_structure_to_src
 
     if browser?
@@ -72,7 +66,6 @@ class LuckyCli::Generators::Web
     end
 
     setup_gitignore
-    remove_default_license
 
     puts <<-TEXT
     #{"Done generating your Lucky project".colorize.bold}
@@ -89,41 +82,49 @@ class LuckyCli::Generators::Web
     if default_directory?
       project_dir
     else
-      [full_project_directory.chomp('/'), project_dir].join('/')
+      File.join(full_project_directory, project_dir)
     end
   end
 
   private def setup_gitignore
-    append_text to: ".gitignore", text: <<-TEXT
-    start_server
-    *.dwarf
-    *.local.cr
-    .env
-    /tmp
-    TEXT
-    if browser?
-      append_text to: ".gitignore", text: <<-TEXT
-      /public/js
-      /public/css
-      /public/mix-manifest.json
-      /node_modules
-      yarn-error.log
+    File.open(File.join(project_dir, ".gitignore"), "w") do |io|
+      io << <<-TEXT
+      /docs/
+      /lib/
+      /bin/
+      /.shards/
+      *.dwarf
+      start_server
+      *.dwarf
+      *.local.cr
+      .env
+      /tmp
       TEXT
+
+      if browser?
+        io << <<-TEXT
+        /public/js
+        /public/css
+        /public/mix-manifest.json
+        /node_modules
+        yarn-error.log
+        TEXT
+      end
     end
   end
 
   private def add_default_lucky_structure_to_src
     SrcTemplate.new(project_name, generate_auth: generate_auth?, api_only: api_only?, with_sec_tester: with_sec_tester?)
-      .render("./#{project_dir}", force: true)
+      .render(project_dir, force: true)
   end
 
   private def add_browser_app_structure_to_src
     BrowserSrcTemplate.new(generate_auth: generate_auth?)
-      .render("./#{project_dir}", force: true)
+      .render(project_dir, force: true)
   end
 
   private def add_base_auth_to_src
-    BaseAuthenticationSrcTemplate.new.render("./#{project_dir}", force: true)
+    BaseAuthenticationSrcTemplate.new.render(Path[project_dir])
   end
 
   private def add_api_authentication_to_src
@@ -131,7 +132,7 @@ class LuckyCli::Generators::Web
   end
 
   private def add_browser_authentication_to_src
-    BrowserAuthenticationSrcTemplate.new.render("./#{project_dir}", force: true)
+    BrowserAuthenticationSrcTemplate.new.render(project_dir, force: true)
   end
 
   private def add_sec_tester_to_src
@@ -139,121 +140,22 @@ class LuckyCli::Generators::Web
       .render(Path[project_dir])
   end
 
-  private def remove_generated_src_files
-    remove_default_generated_if_exists("src")
-  end
-
-  private def remove_generated_spec_files
-    remove_default_generated_if_exists("spec")
-  end
-
-  private def remove_default_readme
-    remove_default_generated_if_exists("README.md")
-  end
-
-  private def remove_default_license
-    remove_license_from_shard
-    remove_default_generated_if_exists("LICENSE")
-  end
-
-  private def remove_default_generated_if_exists(file_or_directory : String)
-    to_delete = "#{project_dir}/#{file_or_directory}"
-    if File.exists?(to_delete)
-      FileUtils.rm_rf(to_delete)
-    end
-  end
-
-  private def remove_license_from_shard
-    shard_path = "#{project_dir}/shard.yml"
-    lines = [] of String
-    File.each_line shard_path do |line|
-      lines << line unless line.includes?("license")
-    end
-    File.write shard_path, lines.join("\n")
-  end
-
   private def install_shards
     puts "Installing shards"
     run_command "shards install"
   end
 
-  private def generate_default_crystal_project
-    io = IO::Memory.new
-    Process.run "crystal init app #{project_name} #{project_dir}",
-      shell: true,
-      output: io,
-      error: STDERR
-  end
-
-  private def rename_shard_target_to_app
-    replace_text "shard.yml", from: "#{project_name}:", to: "app:"
-  end
-
-  private def add_deps_to_shard_file
-    append_text to: "shard.yml", text: <<-DEPS_LIST
-    dependencies:
-      lucky:
-        github: luckyframework/lucky
-        version: ~> 1.0.0
-      avram:
-        github: luckyframework/avram
-        version: ~> 1.0.0
-      carbon:
-        github: luckyframework/carbon
-        version: ~> 0.3.0
-      carbon_sendgrid_adapter:
-        github: luckyframework/carbon_sendgrid_adapter
-        version: ~> 0.3.0
-      lucky_env:
-        github: luckyframework/lucky_env
-        version: ~> 0.1.4
-      lucky_task:
-        github: luckyframework/lucky_task
-        version: ~> 0.1.1
-    DEPS_LIST
-
-    if generate_auth?
-      append_text to: "shard.yml", text: <<-DEPS_LIST
-        authentic:
-          github: luckyframework/authentic
-          version: ~> 1.0.0
-        jwt:
-          github: crystal-community/jwt
-          version: ~> 1.6.0
-      DEPS_LIST
-    end
-  end
-
-  private def needs_development_dependencies?
-    browser? || with_sec_tester?
+  private def generate_default_project : Nil
+    Dir.mkdir_p(project_dir)
   end
 
-  private def add_dev_deps_to_shard_file
-    if needs_development_dependencies?
-      append_text to: "shard.yml", text: <<-DEPS_LIST
-      development_dependencies:
-      DEPS_LIST
-
-      if browser?
-        append_text to: "shard.yml", text: <<-DEPS_LIST
-          lucky_flow:
-            github: luckyframework/lucky_flow
-            version: ~> 0.9.0
-        DEPS_LIST
-      end
-
-      if with_sec_tester?
-        append_text to: "shard.yml", text: <<-DEPS_LIST
-          lucky_sec_tester:
-            github: luckyframework/lucky_sec_tester
-            version: ~> 0.2.0
-        DEPS_LIST
-      end
-    end
+  private def generate_shard_yml : Nil
+    ShardFileGenerator.new(project_name, generate_auth: generate_auth?, browser: browser?, with_sec_tester: with_sec_tester?)
+      .render(project_dir)
   end
 
   private def ensure_directory_does_not_exist
-    if Dir.exists?("./#{project_dir}")
+    if Dir.exists?(project_dir)
       puts "Folder named #{project_dir} already exists, please use a different name".colorize.red.bold
       exit
     end
diff --git a/src/lucky_cli/base_authentication_src_template.cr b/src/lucky_cli/base_authentication_src_template.cr
index 5bbc564f..5b3e2c7f 100644
--- a/src/lucky_cli/base_authentication_src_template.cr
+++ b/src/lucky_cli/base_authentication_src_template.cr
@@ -34,10 +34,26 @@ class BaseAuthenticationSrcTemplate
       end
       src_dir.add_folder("operations") do |ops_dir|
         ops_dir.add_file(".keep")
-        # ...
+        ops_dir.add_file("request_password_reset.cr") do |io|
+          ECR.embed("#{__DIR__}/../base_authentication_app_skeleton/src/operations/request_password_reset.cr.ecr", io)
+        end
+        ops_dir.add_file("reset_password.cr") do |io|
+          ECR.embed("#{__DIR__}/../base_authentication_app_skeleton/src/operations/reset_password.cr.ecr", io)
+        end
+        ops_dir.add_file("sign_in_user.cr") do |io|
+          ECR.embed("#{__DIR__}/../base_authentication_app_skeleton/src/operations/sign_in_user.cr.ecr", io)
+        end
+        ops_dir.add_file("sign_up_user.cr") do |io|
+          ECR.embed("#{__DIR__}/../base_authentication_app_skeleton/src/operations/sign_up_user.cr.ecr", io)
+        end
         ops_dir.add_folder("mixins") do |mixins_dir|
           mixins_dir.add_file(".keep")
-          # ...
+          mixins_dir.add_file("password_validations.cr") do |io|
+            ECR.embed("#{__DIR__}/../base_authentication_app_skeleton/src/operations/mixins/password_validations.cr.ecr", io)
+          end
+          mixins_dir.add_file("user_from_email.cr") do |io|
+            ECR.embed("#{__DIR__}/../base_authentication_app_skeleton/src/operations/mixins/user_from_email.cr.ecr", io)
+          end
         end
       end
     end