diff --git a/app/roles/repository.rb b/app/roles/repository.rb
index 8942eaea754..88468117822 100644
--- a/app/roles/repository.rb
+++ b/app/roles/repository.rb
@@ -41,7 +41,7 @@ module Repository
   end
 
   def satellite
-    @satellite ||= Gitlab::Satellite.new(self)
+    @satellite ||= Gitlab::Satellite::Satellite.new(self)
   end
 
   def has_post_receive_file?
diff --git a/lib/gitlab/satellite.rb b/lib/gitlab/satellite.rb
deleted file mode 100644
index 64875f3fb30..00000000000
--- a/lib/gitlab/satellite.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Gitlab
-  class Satellite
-
-    PARKING_BRANCH = "__parking_branch"
-
-    attr_accessor :project
-
-    def initialize(project)
-      @project = project
-    end
-
-    #will be deleted all branches except PARKING_BRANCH
-    def clear
-      Dir.chdir(path) do
-        heads = Grit::Repo.new(".").heads.map{|head| head.name}
-        if heads.include? PARKING_BRANCH
-          `git checkout #{PARKING_BRANCH}`
-        else
-          `git checkout -b #{PARKING_BRANCH}`
-        end
-        heads.delete(PARKING_BRANCH)
-        heads.each do |head|
-          `git branch -D #{head}`
-        end
-      end
-    end
-
-    def create
-      `git clone #{project.url_to_repo} #{path}`
-    end
-
-    def exists?
-      File.exists? path
-    end
-
-    def path
-      Rails.root.join("tmp", "repo_satellites", project.path)
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
new file mode 100644
index 00000000000..5137cd4cf01
--- /dev/null
+++ b/lib/gitlab/satellite/satellite.rb
@@ -0,0 +1,41 @@
+module Gitlab
+  module Satellite
+    class Satellite
+      PARKING_BRANCH = "__parking_branch"
+
+      attr_accessor :project
+
+      def initialize(project)
+        @project = project
+      end
+
+      #will be deleted all branches except PARKING_BRANCH
+      def clear
+        Dir.chdir(path) do
+          heads = Grit::Repo.new(".").heads.map{|head| head.name}
+          if heads.include? PARKING_BRANCH
+            `git checkout #{PARKING_BRANCH}`
+          else
+            `git checkout -b #{PARKING_BRANCH}`
+          end
+          heads.delete(PARKING_BRANCH)
+          heads.each do |head|
+            `git branch -D #{head}`
+          end
+        end
+      end
+
+      def create
+        `git clone #{project.url_to_repo} #{path}`
+      end
+
+      def exists?
+        File.exists? path
+      end
+
+      def path
+        Rails.root.join("tmp", "repo_satellites", project.path)
+      end
+    end
+  end
+end