diff --git a/Makefile b/Makefile
index 149b621..6aeda9b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ clean:
 # Build the wheel package
 build: clean
 	@echo "Building wheel package..."
-	python -m build
+	python3 -m build
 	@echo "Build complete. Artifacts in dist/"
 
 # Install package in development mode
@@ -43,4 +43,4 @@ dev: clean build
 	@echo "Installing newly built package..."
 	pip uninstall kumacli -y 2>/dev/null || true
 	pip install dist/kumacli-*.whl
-	@echo "Development installation complete."
\ No newline at end of file
+	@echo "Development installation complete."
diff --git a/setup.py b/setup.py
index d58921a..c89ceda 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="kumacli",
-    version="1.0.0",
+    version="1.1.0",
     author="Uptime Kuma CLI",
     description="A command-line interface for Uptime Kuma",
     long_description=long_description,
@@ -36,7 +36,7 @@ setup(
     ],
     entry_points={
         "console_scripts": [
-            "kumacli=kumacli.__main__:main",
+            "kumacli=kumacli.kumacli:main",
         ],
     },
     keywords="uptime kuma monitoring cli",
@@ -44,4 +44,4 @@ setup(
         "Bug Reports": "https://github.com/yourusername/kumacli/issues",
         "Source": "https://github.com/yourusername/kumacli",
     },
-)
\ No newline at end of file
+)
diff --git a/src/kumacli/__init__.py b/src/kumacli/__init__.py
index 5156f9a..f473402 100644
--- a/src/kumacli/__init__.py
+++ b/src/kumacli/__init__.py
@@ -6,6 +6,6 @@ __version__ = "1.0.0"
 __author__ = "KumaCLI Team"
 __email__ = "info@kumacli.com"
 
-from kumacli.__main__ import main
+from kumacli.kumacli import main
 
-__all__ = ["main"]
\ No newline at end of file
+__all__ = ["main"]
diff --git a/src/kumacli/cmd/maintenance.py b/src/kumacli/cmd/maintenance.py
index 924da76..b926063 100644
--- a/src/kumacli/cmd/maintenance.py
+++ b/src/kumacli/cmd/maintenance.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 from datetime import datetime, timedelta
-from kumacli.client import KumaClient
+from ..client import KumaClient
 
 
 class MaintenanceCommands:
diff --git a/src/kumacli/cmd/monitor.py b/src/kumacli/cmd/monitor.py
index a88d2ee..2c1fe3e 100644
--- a/src/kumacli/cmd/monitor.py
+++ b/src/kumacli/cmd/monitor.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from kumacli.client import KumaClient
+from ..client import KumaClient
 
 
 class MonitorCommands:
diff --git a/src/kumacli/__main__.py b/src/kumacli/kumacli.py
similarity index 73%
rename from src/kumacli/__main__.py
rename to src/kumacli/kumacli.py
index 956cbe6..026b5b0 100755
--- a/src/kumacli/__main__.py
+++ b/src/kumacli/kumacli.py
@@ -5,9 +5,20 @@ import os
 import sys
 from datetime import datetime
 
-from kumacli.client import KumaClient
-from kumacli.cmd.monitor import setup_monitor_parser, handle_monitor_command
-from kumacli.cmd.maintenance import setup_maintenance_parser, handle_maintenance_command
+# Handle both direct execution and package import
+try:
+    from .client import KumaClient
+    from .cmd.monitor import setup_monitor_parser, handle_monitor_command
+    from .cmd.maintenance import setup_maintenance_parser, handle_maintenance_command
+except ImportError:
+    # Running directly, add parent directory to path
+    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    from kumacli.client import KumaClient
+    from kumacli.cmd.monitor import setup_monitor_parser, handle_monitor_command
+    from kumacli.cmd.maintenance import (
+        setup_maintenance_parser,
+        handle_maintenance_command,
+    )
 
 
 def main():