remove extra folder

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "crewai"
-version = "0.22.2"
+version = "0.22.5"
 description = "Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks."
 authors = ["Joao Moura <joao@crewai.com>"]
 readme = "README.md"
@@ -26,6 +26,7 @@ instructor = "^0.5.2"
 regex = "^2023.12.25"
 crewai-tools = { version = "^0.0.15", optional = true }
 click = "^8.1.7"
+python-dotenv = "1.0.0"
 
 [tool.poetry.extras]
 tools = ["crewai-tools"]

src/crewai/cli/create_crew.py

@@ -15,9 +15,8 @@ def create_crew(name):
         os.mkdir(folder_name)
         os.mkdir(folder_name + "/tests")
         os.mkdir(folder_name + "/src")
-        os.mkdir(folder_name + f"/src/{folder_name}")
-        os.mkdir(folder_name + f"/src/{folder_name}/tools")
-        os.mkdir(folder_name + f"/src/{folder_name}/config")
+        os.mkdir(folder_name + "/src/tools")
+        os.mkdir(folder_name + "/src/config")
         with open(folder_name + "/.env", "w") as file:
             file.write("OPENAI_API_KEY=YOUR_API_KEY")
     else:
@@ -47,17 +46,17 @@ def create_crew(name):
 
     for file_name in src_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = Path(folder_name) / "src" / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
     for file_name in tools_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = Path(folder_name) / "src" / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
     for file_name in config_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = Path(folder_name) / "src" / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
     click.secho(f"Crew {name} created successfully!", fg="green", bold=True)

src/crewai/cli/templates/crew.py

@@ -2,7 +2,7 @@ from crewai import Agent, Crew, Process, Task
 from crewai.project import CrewBase, agent, crew, task
 
 # Uncomment the following line to use an example of a custom tool
-# from .tools.custom_tool import MyCustomTool
+# from {{folder_name}}.tools.custom_tool import MyCustomTool
 
 # Check our tools documentations for more information on how to use them
 # from crewai_tools import SerperDevTool

src/crewai/cli/templates/main.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from .crew import {{crew_name}}Crew
+from crew import {{crew_name}}Crew
 
 
 def run():
@@ -7,4 +7,7 @@ def run():
     inputs = {
         'topic': 'AI LLMs'
     }
-    {{crew_name}}Crew().crew().kickoff(inputs=inputs)
+    {{crew_name}}Crew().crew().kickoff(inputs=inputs)
+
+if __name__ == "__main__":
+    run()

src/crewai/project/crew_base.py

@@ -3,6 +3,9 @@ import os
 from pathlib import Path
 
 import yaml
+from dotenv import load_dotenv
+
+load_dotenv()
 
 
 def CrewBase(cls):