diff --git a/lib/motion/project/command/account.rb b/lib/motion/project/command/account.rb
index fde43114..de4e4f25 100644
--- a/lib/motion/project/command/account.rb
+++ b/lib/motion/project/command/account.rb
@@ -21,7 +21,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module Motion; module Project
+module Motion; module Project; class Command
   class Account < Command
     self.summary = 'Access account details.'
     self.description = 'Access the details of your software license account.'
@@ -33,4 +33,4 @@ module Motion; module Project
       system("open \"https://secure.rubymotion.com/account?license_key=#{license_key}&email=#{email}\"")
     end
   end
-end; end
+end; end; end
diff --git a/lib/motion/project/command/activate.rb b/lib/motion/project/command/activate.rb
index 114b6ad2..3c592e05 100644
--- a/lib/motion/project/command/activate.rb
+++ b/lib/motion/project/command/activate.rb
@@ -21,7 +21,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module Motion; module Project
+module Motion; module Project; class Command
   class Activate < Command
     self.summary = 'Activate software license.'
     self.description = 'Activate your RubyMotion software license key.'
@@ -52,4 +52,4 @@ module Motion; module Project
       puts "Product activated. Thanks for purchasing RubyMotion :-)"
     end
   end
-end; end
+end; end; end
diff --git a/lib/motion/project/command/changelog.rb b/lib/motion/project/command/changelog.rb
index a3649b37..185f573e 100644
--- a/lib/motion/project/command/changelog.rb
+++ b/lib/motion/project/command/changelog.rb
@@ -21,7 +21,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module Motion; module Project
+module Motion; module Project; class Command
   class Changelog < Command
     self.summary = 'View the changelog.'
     self.description = 'View the changes that have been made in all ' \
@@ -31,5 +31,4 @@ module Motion; module Project
       system("#{pager} /Library/RubyMotion/NEWS")
     end
   end
-end; end
-
+end; end; end
diff --git a/lib/motion/project/command/create.rb b/lib/motion/project/command/create.rb
index 15e74a7d..ac114e3a 100644
--- a/lib/motion/project/command/create.rb
+++ b/lib/motion/project/command/create.rb
@@ -24,7 +24,7 @@
 require 'motion/project/app'
 require 'motion/project/template'
 
-module Motion; module Project
+module Motion; module Project; class Command
   class Create < Command
     DefaultTemplate = 'ios'
 
@@ -69,4 +69,4 @@ module Motion; module Project
       Motion::Project::App.create(@app_name, @template)
     end
   end
-end; end
+end; end; end
diff --git a/lib/motion/project/command/device_console.rb b/lib/motion/project/command/device_console.rb
index e4cc188f..b141cc35 100644
--- a/lib/motion/project/command/device_console.rb
+++ b/lib/motion/project/command/device_console.rb
@@ -21,7 +21,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module Motion; module Project
+module Motion; module Project; class Command
   class DeprecatedDeviceConsole < Command
     self.command = 'device:console'
 
@@ -47,5 +47,4 @@ module Motion; module Project
       end
     end
   end
-end; end
-
+end; end; end
diff --git a/lib/motion/project/command/ri.rb b/lib/motion/project/command/ri.rb
index f6762f0e..c88edc9c 100644
--- a/lib/motion/project/command/ri.rb
+++ b/lib/motion/project/command/ri.rb
@@ -21,7 +21,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module Motion; module Project
+module Motion; module Project; class Command
   class RI < Command
     self.summary = 'Display API reference.'
     self.description = 'Display Cocoa(Touch) API reference documentation ' \
@@ -46,4 +46,4 @@ module Motion; module Project
       system(line)
     end
   end
-end; end
+end; end; end
diff --git a/lib/motion/project/command/support.rb b/lib/motion/project/command/support.rb
index 6a3c89ad..e120b5c1 100644
--- a/lib/motion/project/command/support.rb
+++ b/lib/motion/project/command/support.rb
@@ -23,7 +23,7 @@
 
 require 'uri'
 
-module Motion; module Project
+module Motion; module Project; class Command
   class Support < Command
     self.summary = 'Create a support ticket.'
     # TODO make more elaborate
@@ -52,4 +52,4 @@ module Motion; module Project
       system("open \"https://secure.rubymotion.com/new_support_ticket?license_key=#{license_key}&email=#{email}&environment=#{environment}\"")
     end
   end
-end; end
+end; end; end
diff --git a/lib/motion/project/command/update.rb b/lib/motion/project/command/update.rb
index 0dcd480a..fdb71cd8 100644
--- a/lib/motion/project/command/update.rb
+++ b/lib/motion/project/command/update.rb
@@ -23,7 +23,7 @@
 
 require 'motion/project/builder'
 
-module Motion; module Project
+module Motion; module Project; class Command
   class Update < Command
     self.summary = 'Update the software.'
     # TODO make more elaborate
@@ -156,4 +156,4 @@ module Motion; module Project
       end
     end
   end
-end; end
+end; end; end