diff --git a/src/Column.cpp b/src/columns/Column.cpp
similarity index 100%
rename from src/Column.cpp
rename to src/columns/Column.cpp
diff --git a/src/Column.h b/src/columns/Column.h
similarity index 100%
rename from src/Column.h
rename to src/columns/Column.h
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
new file mode 100644
index 000000000..e3530c8f4
--- /dev/null
+++ b/src/commands/Command.cpp
@@ -0,0 +1,78 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include <Command.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+Command::Command ()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////
+Command::Command (const Command& other)
+{
+/*
+  _minimum = other._minimum;
+*/
+}
+
+////////////////////////////////////////////////////////////////////////////////
+Command& Command::operator= (const Command& other)
+{
+  if (this != &other)
+  {
+/*
+    _name    = other._name;
+*/
+  }
+
+  return *this;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool Command::operator== (const Command& other) const
+{
+  return false;
+/*
+  return _name    == other._name    &&
+         _minimum == other._minimum &&
+         _maximum == other._maximum &&
+         _wrap    == other._wrap    &&
+         _just    == other._just    &&
+         _sizing  == other._sizing;
+*/
+}
+
+////////////////////////////////////////////////////////////////////////////////
+Command::~Command ()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/Command.h b/src/commands/Command.h
new file mode 100644
index 000000000..38e79d3bc
--- /dev/null
+++ b/src/commands/Command.h
@@ -0,0 +1,54 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+////////////////////////////////////////////////////////////////////////////////
+#ifndef INCLUDED_COMMAND
+#define INCLUDED_COMMAND
+
+#include <string>
+
+class Command
+{
+public:
+  Command ();
+  Command (const Command&);
+  Command& operator= (const Command&);
+  bool operator== (const Command&) const;     // TODO Is this necessary?
+  ~Command ();
+
+/*
+  std::string syntax () const;
+  std::string help () const;
+  bool validate_args (Tree*);
+  std::string results ();
+  int execute (Tree*); 
+  bool needs_gc () const;
+*/
+
+private:
+};
+
+#endif
+////////////////////////////////////////////////////////////////////////////////