diff --git a/Gitolite/Commands/Setup.pm b/Gitolite/Setup.pm
similarity index 99%
rename from Gitolite/Commands/Setup.pm
rename to Gitolite/Setup.pm
index 939de8e..28d1d74 100644
--- a/Gitolite/Commands/Setup.pm
+++ b/Gitolite/Setup.pm
@@ -1,4 +1,4 @@
-package Gitolite::Commands::Setup;
+package Gitolite::Setup;
 
 # implements 'gitolite setup'
 # ----------------------------------------------------------------------
diff --git a/gitolite b/gitolite
index f6271b8..646d036 100755
--- a/gitolite
+++ b/gitolite
@@ -48,8 +48,8 @@ sub args {
 
     if ( $command eq 'setup' ) {
         shift @ARGV;
-        require Gitolite::Commands::Setup;
-        Gitolite::Commands::Setup->import;
+        require Gitolite::Setup;
+        Gitolite::Setup->import;
         setup();
     } elsif ( $command eq 'compile' ) {
         shift @ARGV;