Fixed namespacing in sigmodr tree

68 files changed, 560 insertions, 389 deletions

diff --git a/sigmodr/tree/AbilityGroupModel.cpp b/sigmodr/tree/AbilityGroupModel.cpp
index bf47615a..8f27683d 100644
--- a/sigmodr/tree/AbilityGroupModel.cpp
+++ b/sigmodr/tree/AbilityGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::AbilityGroupModel::AbilityGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+AbilityGroupModel::AbilityGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Abilities")
 {
     for (int i = 0; i < game->abilityCount(); ++i)
         addObject(game->ability(i));
 }
 
-QVariant Sigmodr::Tree::AbilityGroupModel::data(const int role) const
+QVariant AbilityGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::AbilityGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::AbilityGroupModel::setData(const QVariant& value, int role)
+bool AbilityGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::AbilityGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::AbilityGroupModel::types() const
+QString AbilityGroupModel::types() const
 {
     return "Ability";
 }
 
-void Sigmodr::Tree::AbilityGroupModel::addObject(Sigmod::Object* object)
+void AbilityGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newAbility();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::AbilityGroupModel::addObject(Sigmod::Object* object)
         addChild(new AbilityModel(this, qobject_cast<Sigmod::Ability*>(object)));
 }
 
-void Sigmodr::Tree::AbilityGroupModel::deleteObject(BaseModel* model)
+void AbilityGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/AbilityModel.cpp b/sigmodr/tree/AbilityModel.cpp
index e8b8c0cf..c28824c6 100644
--- a/sigmodr/tree/AbilityModel.cpp
+++ b/sigmodr/tree/AbilityModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::AbilityModel::AbilityModel(BaseModel* parent, Sigmod::Ability* ability) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+AbilityModel::AbilityModel(BaseModel* parent, Sigmod::Ability* ability) :
         ObjectModel(parent, ability)
 {
 }
 
-QVariant Sigmodr::Tree::AbilityModel::data(int role) const
+QVariant AbilityModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Ability*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::AbilityModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::AbilityModel::deleteSelf()
+void AbilityModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/AuthorGroupModel.cpp b/sigmodr/tree/AuthorGroupModel.cpp
index 2d910c33..e2cbf172 100644
--- a/sigmodr/tree/AuthorGroupModel.cpp
+++ b/sigmodr/tree/AuthorGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::AuthorGroupModel::AuthorGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+AuthorGroupModel::AuthorGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Authors")
 {
     for (int i = 0; i < game->authorCount(); ++i)
         addObject(game->author(i));
 }
 
-QVariant Sigmodr::Tree::AuthorGroupModel::data(const int role) const
+QVariant AuthorGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::AuthorGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::AuthorGroupModel::setData(const QVariant& value, int role)
+bool AuthorGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::AuthorGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::AuthorGroupModel::types() const
+QString AuthorGroupModel::types() const
 {
     return "Author";
 }
 
-void Sigmodr::Tree::AuthorGroupModel::addObject(Sigmod::Object* object)
+void AuthorGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newAuthor();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::AuthorGroupModel::addObject(Sigmod::Object* object)
         addChild(new AuthorModel(this, qobject_cast<Sigmod::Author*>(object)));
 }
 
-void Sigmodr::Tree::AuthorGroupModel::deleteObject(BaseModel* model)
+void AuthorGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/AuthorModel.cpp b/sigmodr/tree/AuthorModel.cpp
index 20eb0491..14d7d9df 100644
--- a/sigmodr/tree/AuthorModel.cpp
+++ b/sigmodr/tree/AuthorModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::AuthorModel::AuthorModel(BaseModel* parent, Sigmod::Author* author) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+AuthorModel::AuthorModel(BaseModel* parent, Sigmod::Author* author) :
         ObjectModel(parent, author)
 {
 }
 
-QVariant Sigmodr::Tree::AuthorModel::data(int role) const
+QVariant AuthorModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Author*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::AuthorModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::AuthorModel::deleteSelf()
+void AuthorModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/BadgeGroupModel.cpp b/sigmodr/tree/BadgeGroupModel.cpp
index e6d93cf7..61162f37 100644
--- a/sigmodr/tree/BadgeGroupModel.cpp
+++ b/sigmodr/tree/BadgeGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::BadgeGroupModel::BadgeGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+BadgeGroupModel::BadgeGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Badges")
 {
     for (int i = 0; i < game->badgeCount(); ++i)
         addObject(game->badge(i));
 }
 
-QVariant Sigmodr::Tree::BadgeGroupModel::data(const int role) const
+QVariant BadgeGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::BadgeGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::BadgeGroupModel::setData(const QVariant& value, int role)
+bool BadgeGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::BadgeGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::BadgeGroupModel::types() const
+QString BadgeGroupModel::types() const
 {
     return "Badge";
 }
 
-void Sigmodr::Tree::BadgeGroupModel::addObject(Sigmod::Object* object)
+void BadgeGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newBadge();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::BadgeGroupModel::addObject(Sigmod::Object* object)
         addChild(new BadgeModel(this, qobject_cast<Sigmod::Badge*>(object)));
 }
 
-void Sigmodr::Tree::BadgeGroupModel::deleteObject(BaseModel* model)
+void BadgeGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/BadgeModel.cpp b/sigmodr/tree/BadgeModel.cpp
index 06f3d9fa..364c3c7d 100644
--- a/sigmodr/tree/BadgeModel.cpp
+++ b/sigmodr/tree/BadgeModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::BadgeModel::BadgeModel(BaseModel* parent, Sigmod::Badge* badge) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+BadgeModel::BadgeModel(BaseModel* parent, Sigmod::Badge* badge) :
         ObjectModel(parent, badge)
 {
 }
 
-QVariant Sigmodr::Tree::BadgeModel::data(int role) const
+QVariant BadgeModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Badge*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::BadgeModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::BadgeModel::deleteSelf()
+void BadgeModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/BaseModel.cpp b/sigmodr/tree/BaseModel.cpp
index 32203dc9..92f530fe 100644
--- a/sigmodr/tree/BaseModel.cpp
+++ b/sigmodr/tree/BaseModel.cpp
@@ -31,24 +31,26 @@
 #include <QtCore/QFile>
 #include <QtXml/QDomDocument>
 
-const int Sigmodr::Tree::BaseModel::TypeRole = Qt::UserRole;
-const int Sigmodr::Tree::BaseModel::DropAcceptRole = Qt::UserRole + 1;
-const int Sigmodr::Tree::BaseModel::XmlRole = Qt::UserRole + 2;
-const int Sigmodr::Tree::BaseModel::WidgetRole = Qt::UserRole + 3;
-const int Sigmodr::Tree::BaseModel::ContextMenuRole = Qt::UserRole + 4;
+using namespace Sigmodr::Tree;
 
-Sigmodr::Tree::BaseModel::BaseModel(BaseModel* parent, Sigmod::Object* object, const QString& name) :
+const int BaseModel::TypeRole = Qt::UserRole;
+const int BaseModel::DropAcceptRole = Qt::UserRole + 1;
+const int BaseModel::XmlRole = Qt::UserRole + 2;
+const int BaseModel::WidgetRole = Qt::UserRole + 3;
+const int BaseModel::ContextMenuRole = Qt::UserRole + 4;
+
+BaseModel::BaseModel(BaseModel* parent, Sigmod::Object* object, const QString& name) :
         m_parent(parent),
         m_object(object),
         m_name(name)
 {
 }
 
-Sigmodr::Tree::BaseModel::~BaseModel()
+BaseModel::~BaseModel()
 {
 }
 
-QVariant Sigmodr::Tree::BaseModel::data(int role) const
+QVariant BaseModel::data(int role) const
 {
     if (role == TypeRole)
         return type();
@@ -57,29 +59,29 @@ QVariant Sigmodr::Tree::BaseModel::data(int role) const
     return QVariant();
 }
 
-Sigmodr::Tree::BaseModel* Sigmodr::Tree::BaseModel::parent()
+BaseModel* BaseModel::parent()
 {
     return m_parent;
 }
 
-int Sigmodr::Tree::BaseModel::indexNumber() const
+int BaseModel::indexNumber() const
 {
     if (m_parent)
         return m_parent->findChild(const_cast<BaseModel*>(this));
     return -1;
 }
 
-QString Sigmodr::Tree::BaseModel::type() const
+QString BaseModel::type() const
 {
     return "";
 }
 
-const Sigmod::Object* Sigmodr::Tree::BaseModel::object() const
+const Sigmod::Object* BaseModel::object() const
 {
     return m_object;
 }
 
-bool Sigmodr::Tree::BaseModel::loadFromData(const QString& data, QDomDocument* xml) const
+bool BaseModel::loadFromData(const QString& data, QDomDocument* xml) const
 {
     bool loaded = false;
     QString error;
@@ -125,14 +127,14 @@ bool Sigmodr::Tree::BaseModel::loadFromData(const QString& data, QDomDocument* x
     return loaded;
 }
 
-void Sigmodr::Tree::BaseModel::childRowChanged(const int row)
+void BaseModel::childRowChanged(const int row)
 {
     QList<int> indexes;
     indexes << indexNumber() << row;
     emit(rowsChanged(indexes));
 }
 
-void Sigmodr::Tree::BaseModel::childRowsChanged(const QList<int>& rows)
+void BaseModel::childRowsChanged(const QList<int>& rows)
 {
     QList<int> indexes;
     indexes << indexNumber() << rows;
diff --git a/sigmodr/tree/BaseObjectModel.cpp b/sigmodr/tree/BaseObjectModel.cpp
index ae66241b..673aa2cc 100644
--- a/sigmodr/tree/BaseObjectModel.cpp
+++ b/sigmodr/tree/BaseObjectModel.cpp
@@ -21,41 +21,43 @@
 // Sigmod includes
 #include <sigmod/Object.h>
 
-Sigmodr::Tree::BaseObjectModel::BaseObjectModel(BaseModel* parent, Sigmod::Object* object) :
+using namespace Sigmodr::Tree;
+
+BaseObjectModel::BaseObjectModel(BaseModel* parent, Sigmod::Object* object) :
         BaseModel(parent, object, "")
 {
 }
 
-Sigmodr::Tree::BaseObjectModel::~BaseObjectModel()
+BaseObjectModel::~BaseObjectModel()
 {
 }
 
-QVariant Sigmodr::Tree::BaseObjectModel::data(int role) const
+QVariant BaseObjectModel::data(int role) const
 {
     return BaseModel::data(role);
 }
 
-Qt::ItemFlags Sigmodr::Tree::BaseObjectModel::flags() const
+Qt::ItemFlags BaseObjectModel::flags() const
 {
     return Qt::ItemIsDragEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
 }
 
-Qt::DropActions Sigmodr::Tree::BaseObjectModel::supportedDragActions() const
+Qt::DropActions BaseObjectModel::supportedDragActions() const
 {
     return Qt::CopyAction | Qt::MoveAction;
 }
 
-Qt::DropActions Sigmodr::Tree::BaseObjectModel::supportedDropActions() const
+Qt::DropActions BaseObjectModel::supportedDropActions() const
 {
     return Qt::CopyAction | Qt::MoveAction;
 }
 
-QString Sigmodr::Tree::BaseObjectModel::type() const
+QString BaseObjectModel::type() const
 {
     return m_object->className();
 }
 
-int Sigmodr::Tree::BaseObjectModel::findChild(BaseModel* model) const
+int BaseObjectModel::findChild(BaseModel* model) const
 {
     Q_UNUSED(model)
     return -1;
diff --git a/sigmodr/tree/CoinListGroupModel.cpp b/sigmodr/tree/CoinListGroupModel.cpp
index f99cf1b6..ce8e86d9 100644
--- a/sigmodr/tree/CoinListGroupModel.cpp
+++ b/sigmodr/tree/CoinListGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::CoinListGroupModel::CoinListGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+CoinListGroupModel::CoinListGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Coin Lists")
 {
     for (int i = 0; i < game->coinListCount(); ++i)
         addObject(game->coinList(i));
 }
 
-QVariant Sigmodr::Tree::CoinListGroupModel::data(const int role) const
+QVariant CoinListGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::CoinListGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::CoinListGroupModel::setData(const QVariant& value, int role)
+bool CoinListGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::CoinListGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::CoinListGroupModel::types() const
+QString CoinListGroupModel::types() const
 {
     return "CoinList";
 }
 
-void Sigmodr::Tree::CoinListGroupModel::addObject(Sigmod::Object* object)
+void CoinListGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newCoinList();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::CoinListGroupModel::addObject(Sigmod::Object* object)
         addChild(new CoinListModel(this, qobject_cast<Sigmod::CoinList*>(object)));
 }
 
-void Sigmodr::Tree::CoinListGroupModel::deleteObject(BaseModel* model)
+void CoinListGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/CoinListItemModel.cpp b/sigmodr/tree/CoinListItemModel.cpp
index 7f26aff5..4be11784 100644
--- a/sigmodr/tree/CoinListItemModel.cpp
+++ b/sigmodr/tree/CoinListItemModel.cpp
@@ -34,12 +34,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::CoinListItemModel::CoinListItemModel(BaseModel* parent, Sigmod::CoinListItem* item) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+CoinListItemModel::CoinListItemModel(BaseModel* parent, Sigmod::CoinListItem* item) :
         ObjectModel(parent, item)
 {
 }
 
-QVariant Sigmodr::Tree::CoinListItemModel::data(int role) const
+QVariant CoinListItemModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
     {
@@ -78,7 +81,7 @@ QVariant Sigmodr::Tree::CoinListItemModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::CoinListItemModel::deleteSelf()
+void CoinListItemModel::deleteSelf()
 {
     qobject_cast<GroupObjectModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/CoinListModel.cpp b/sigmodr/tree/CoinListModel.cpp
index b19831cb..a3062314 100644
--- a/sigmodr/tree/CoinListModel.cpp
+++ b/sigmodr/tree/CoinListModel.cpp
@@ -32,18 +32,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::CoinListModel::CoinListModel(BaseModel* parent, Sigmod::CoinList* coinList) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+CoinListModel::CoinListModel(BaseModel* parent, Sigmod::CoinList* coinList) :
         GroupObjectModel(parent, coinList)
 {
     setupData();
 }
 
-Sigmodr::Tree::CoinListModel::~CoinListModel()
+CoinListModel::~CoinListModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::CoinListModel::data(int role) const
+QVariant CoinListModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::CoinList*>(m_object)->name();
@@ -69,7 +72,7 @@ QVariant Sigmodr::Tree::CoinListModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::CoinListModel::setData(const QVariant& value, int role)
+bool CoinListModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -97,12 +100,12 @@ bool Sigmodr::Tree::CoinListModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::CoinListModel::types() const
+QString CoinListModel::types() const
 {
     return type().append(QString(";CoinListItem"));
 }
 
-void Sigmodr::Tree::CoinListModel::addObject(Sigmod::Object* object)
+void CoinListModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::CoinList*>(m_object)->newItem();
@@ -110,7 +113,7 @@ void Sigmodr::Tree::CoinListModel::addObject(Sigmod::Object* object)
         addChild(new CoinListItemModel(this, qobject_cast<Sigmod::CoinListItem*>(object)));
 }
 
-void Sigmodr::Tree::CoinListModel::deleteObject(BaseModel* model)
+void CoinListModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
@@ -122,12 +125,12 @@ void Sigmodr::Tree::CoinListModel::deleteObject(BaseModel* model)
     }
 }
 
-void Sigmodr::Tree::CoinListModel::deleteSelf()
+void CoinListModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void Sigmodr::Tree::CoinListModel::setupData()
+void CoinListModel::setupData()
 {
     Sigmod::CoinList* coinList = qobject_cast<Sigmod::CoinList*>(m_object);
     for (int i = 0; i < coinList->itemCount(); ++i)
diff --git a/sigmodr/tree/EggGroupGroupModel.cpp b/sigmodr/tree/EggGroupGroupModel.cpp
index 1c7efa29..f6182ba6 100644
--- a/sigmodr/tree/EggGroupGroupModel.cpp
+++ b/sigmodr/tree/EggGroupGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::EggGroupGroupModel::EggGroupGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+EggGroupGroupModel::EggGroupGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Egg Groups")
 {
     for (int i = 0; i < game->eggGroupCount(); ++i)
         addObject(game->eggGroup(i));
 }
 
-QVariant Sigmodr::Tree::EggGroupGroupModel::data(const int role) const
+QVariant EggGroupGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::EggGroupGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::EggGroupGroupModel::setData(const QVariant& value, int role)
+bool EggGroupGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::EggGroupGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::EggGroupGroupModel::types() const
+QString EggGroupGroupModel::types() const
 {
     return "EggGroup";
 }
 
-void Sigmodr::Tree::EggGroupGroupModel::addObject(Sigmod::Object* object)
+void EggGroupGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newEggGroup();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::EggGroupGroupModel::addObject(Sigmod::Object* object)
         addChild(new EggGroupModel(this, qobject_cast<Sigmod::EggGroup*>(object)));
 }
 
-void Sigmodr::Tree::EggGroupGroupModel::deleteObject(BaseModel* model)
+void EggGroupGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/EggGroupModel.cpp b/sigmodr/tree/EggGroupModel.cpp
index 00ffc209..c673c205 100644
--- a/sigmodr/tree/EggGroupModel.cpp
+++ b/sigmodr/tree/EggGroupModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::EggGroupModel::EggGroupModel(BaseModel* parent, Sigmod::EggGroup* eggGroup) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+EggGroupModel::EggGroupModel(BaseModel* parent, Sigmod::EggGroup* eggGroup) :
         ObjectModel(parent, eggGroup)
 {
 }
 
-QVariant Sigmodr::Tree::EggGroupModel::data(int role) const
+QVariant EggGroupModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::EggGroup*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::EggGroupModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::EggGroupModel::deleteSelf()
+void EggGroupModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/GameModel.cpp b/sigmodr/tree/GameModel.cpp
index 5d9b75ac..196ab87b 100644
--- a/sigmodr/tree/GameModel.cpp
+++ b/sigmodr/tree/GameModel.cpp
@@ -52,18 +52,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::GameModel::GameModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+GameModel::GameModel(BaseModel* parent, Sigmod::Game* game) :
         GroupObjectModel(parent, game)
 {
     setupData();
 }
 
-Sigmodr::Tree::GameModel::~GameModel()
+GameModel::~GameModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::GameModel::data(int role) const
+QVariant GameModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Game*>(m_object)->title();
@@ -75,7 +78,7 @@ QVariant Sigmodr::Tree::GameModel::data(int role) const
     }
     else if (role == BaseModel::WidgetRole)
     {
-        QWidget* widget = new SigmodUI(qobject_cast<Sigmod::Game*>(m_object), NULL);
+        QWidget* widget = new GameUI(qobject_cast<Sigmod::Game*>(m_object), NULL);
         return QVariant::fromValue(widget);
     }
     else if (role == BaseModel::ContextMenuRole)
@@ -86,7 +89,7 @@ QVariant Sigmodr::Tree::GameModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::GameModel::setData(const QVariant& value, int role)
+bool GameModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -115,26 +118,26 @@ bool Sigmodr::Tree::GameModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::GameModel::types() const
+QString GameModel::types() const
 {
     return type().append(QString(";Rules;Ability;Author;Badge;CoinList;EggGroup;GlobalScript;Item;ItemType;Map;Move;Nature;Skin;Sound;Species;Sprite;Status;Store;Tile;Time;Trainer;Type;Weather"));
 }
 
-void Sigmodr::Tree::GameModel::addObject(Sigmod::Object* object)
+void GameModel::addObject(Sigmod::Object* object)
 {
     Q_UNUSED(object)
 }
 
-void Sigmodr::Tree::GameModel::deleteObject(BaseModel* model)
+void GameModel::deleteObject(BaseModel* model)
 {
     Q_UNUSED(model)
 }
 
-void Sigmodr::Tree::GameModel::deleteSelf()
+void GameModel::deleteSelf()
 {
 }
 
-void Sigmodr::Tree::GameModel::setupData()
+void GameModel::setupData()
 {
     Sigmod::Game* game = qobject_cast<Sigmod::Game*>(m_object);
     addChild(new RulesModel(this, game->rules()));
diff --git a/sigmodr/tree/GlobalScriptGroupModel.cpp b/sigmodr/tree/GlobalScriptGroupModel.cpp
index 8693e8e3..33640055 100644
--- a/sigmodr/tree/GlobalScriptGroupModel.cpp
+++ b/sigmodr/tree/GlobalScriptGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::GlobalScriptGroupModel::GlobalScriptGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+GlobalScriptGroupModel::GlobalScriptGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Global Scripts")
 {
     for (int i = 0; i < game->globalScriptCount(); ++i)
         addObject(game->globalScript(i));
 }
 
-QVariant Sigmodr::Tree::GlobalScriptGroupModel::data(const int role) const
+QVariant GlobalScriptGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::GlobalScriptGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::GlobalScriptGroupModel::setData(const QVariant& value, int role)
+bool GlobalScriptGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::GlobalScriptGroupModel::setData(const QVariant& value, int r
     return false;
 }
 
-QString Sigmodr::Tree::GlobalScriptGroupModel::types() const
+QString GlobalScriptGroupModel::types() const
 {
     return "GlobalScript";
 }
 
-void Sigmodr::Tree::GlobalScriptGroupModel::addObject(Sigmod::Object* object)
+void GlobalScriptGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newGlobalScript();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::GlobalScriptGroupModel::addObject(Sigmod::Object* object)
         addChild(new GlobalScriptModel(this, qobject_cast<Sigmod::GlobalScript*>(object)));
 }
 
-void Sigmodr::Tree::GlobalScriptGroupModel::deleteObject(BaseModel* model)
+void GlobalScriptGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/GlobalScriptModel.cpp b/sigmodr/tree/GlobalScriptModel.cpp
index d4f1e8a5..acf68c62 100644
--- a/sigmodr/tree/GlobalScriptModel.cpp
+++ b/sigmodr/tree/GlobalScriptModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::GlobalScriptModel::GlobalScriptModel(BaseModel* parent, Sigmod::GlobalScript* globalScript) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+GlobalScriptModel::GlobalScriptModel(BaseModel* parent, Sigmod::GlobalScript* globalScript) :
         ObjectModel(parent, globalScript)
 {
 }
 
-QVariant Sigmodr::Tree::GlobalScriptModel::data(int role) const
+QVariant GlobalScriptModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::GlobalScript*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::GlobalScriptModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::GlobalScriptModel::deleteSelf()
+void GlobalScriptModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/GroupModel.cpp b/sigmodr/tree/GroupModel.cpp
index 186c5e86..043336b2 100644
--- a/sigmodr/tree/GroupModel.cpp
+++ b/sigmodr/tree/GroupModel.cpp
@@ -21,52 +21,54 @@
 // Sigmodr tree includes
 #include "BaseObjectModel.h"
 
-Sigmodr::Tree::GroupModel::GroupModel(BaseModel* parent, Sigmod::Object* object, const QString& name) :
+using namespace Sigmodr::Tree;
+
+GroupModel::GroupModel(BaseModel* parent, Sigmod::Object* object, const QString& name) :
         BaseModel(parent, object, name),
         Grouping()
 {
 }
 
-Sigmodr::Tree::GroupModel::~GroupModel()
+GroupModel::~GroupModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::GroupModel::data(int role) const
+QVariant GroupModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return m_name;
     return BaseModel::data(role);
 }
 
-int Sigmodr::Tree::GroupModel::rowCount() const
+int GroupModel::rowCount() const
 {
     return m_objects.size();
 }
 
-Qt::ItemFlags Sigmodr::Tree::GroupModel::flags() const
+Qt::ItemFlags GroupModel::flags() const
 {
     return Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
 }
 
-Sigmodr::Tree::BaseModel* Sigmodr::Tree::GroupModel::childItem(const int row)
+BaseModel* GroupModel::childItem(const int row)
 {
     if (row < m_objects.size())
         return m_objects[row];
     return NULL;
 }
 
-Qt::DropActions Sigmodr::Tree::GroupModel::supportedDragActions() const
+Qt::DropActions GroupModel::supportedDragActions() const
 {
     return 0;
 }
 
-Qt::DropActions Sigmodr::Tree::GroupModel::supportedDropActions() const
+Qt::DropActions GroupModel::supportedDropActions() const
 {
     return Qt::CopyAction | Qt::MoveAction;
 }
 
-void Sigmodr::Tree::GroupModel::addChild(BaseModel* model)
+void GroupModel::addChild(BaseModel* model)
 {
     connect(model, SIGNAL(rowChanged(int)), this, SLOT(childRowChanged(int)));
     connect(model, SIGNAL(rowsChanged(QList<int>)), this, SLOT(childRowsChanged(QList<int>)));
@@ -74,7 +76,7 @@ void Sigmodr::Tree::GroupModel::addChild(BaseModel* model)
     emit(rowChanged(m_objects.size() - 1));
 }
 
-int Sigmodr::Tree::GroupModel::findChild(BaseModel* model) const
+int GroupModel::findChild(BaseModel* model) const
 {
     return find(model);
 }
diff --git a/sigmodr/tree/GroupObjectModel.cpp b/sigmodr/tree/GroupObjectModel.cpp
index fd889785..03ce83b7 100644
--- a/sigmodr/tree/GroupObjectModel.cpp
+++ b/sigmodr/tree/GroupObjectModel.cpp
@@ -18,34 +18,36 @@
 // Header include
 #include "GroupObjectModel.h"
 
-Sigmodr::Tree::GroupObjectModel::GroupObjectModel(BaseModel* parent, Sigmod::Object* object) :
+using namespace Sigmodr::Tree;
+
+GroupObjectModel::GroupObjectModel(BaseModel* parent, Sigmod::Object* object) :
         BaseObjectModel(parent, object),
         Grouping()
 {
 }
 
-Sigmodr::Tree::GroupObjectModel::~GroupObjectModel()
+GroupObjectModel::~GroupObjectModel()
 {
 }
 
-QVariant Sigmodr::Tree::GroupObjectModel::data(int role) const
+QVariant GroupObjectModel::data(int role) const
 {
     return BaseObjectModel::data(role);
 }
 
-int Sigmodr::Tree::GroupObjectModel::rowCount() const
+int GroupObjectModel::rowCount() const
 {
     return m_objects.size();
 }
 
-Sigmodr::Tree::BaseModel* Sigmodr::Tree::GroupObjectModel::childItem(const int row)
+BaseModel* GroupObjectModel::childItem(const int row)
 {
     if (row < m_objects.size())
         return m_objects[row];
     return NULL;
 }
 
-void Sigmodr::Tree::GroupObjectModel::addChild(BaseModel* model)
+void GroupObjectModel::addChild(BaseModel* model)
 {
     connect(model, SIGNAL(rowChanged(int)), this, SLOT(childRowChanged(int)));
     connect(model, SIGNAL(rowsChanged(QList<int>)), this, SLOT(childRowsChanged(QList<int>)));
@@ -53,7 +55,7 @@ void Sigmodr::Tree::GroupObjectModel::addChild(BaseModel* model)
     emit(rowChanged(m_objects.size() - 1));
 }
 
-int Sigmodr::Tree::GroupObjectModel::findChild(BaseModel* model) const
+int GroupObjectModel::findChild(BaseModel* model) const
 {
     return find(model);
 }
diff --git a/sigmodr/tree/Grouping.cpp b/sigmodr/tree/Grouping.cpp
index 99a57a3e..2f9d6015 100644
--- a/sigmodr/tree/Grouping.cpp
+++ b/sigmodr/tree/Grouping.cpp
@@ -21,21 +21,23 @@
 // Sigmodr tree includes
 #include "BaseModel.h"
 
-Sigmodr::Tree::Grouping::Grouping()
+using namespace Sigmodr::Tree;
+
+Grouping::Grouping()
 {
 }
 
-Sigmodr::Tree::Grouping::~Grouping()
+Grouping::~Grouping()
 {
     clearData();
 }
 
-int Sigmodr::Tree::Grouping::find(BaseModel* model) const
+int Grouping::find(BaseModel* model) const
 {
     return m_objects.indexOf(model);
 }
 
-void Sigmodr::Tree::Grouping::clearData()
+void Grouping::clearData()
 {
     qDeleteAll(m_objects);
     m_objects.clear();
diff --git a/sigmodr/tree/ItemGroupModel.cpp b/sigmodr/tree/ItemGroupModel.cpp
index 5b082c79..9b6d2bc8 100644
--- a/sigmodr/tree/ItemGroupModel.cpp
+++ b/sigmodr/tree/ItemGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::ItemGroupModel::ItemGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+ItemGroupModel::ItemGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Items")
 {
     for (int i = 0; i < game->itemCount(); ++i)
         addObject(game->item(i));
 }
 
-QVariant Sigmodr::Tree::ItemGroupModel::data(const int role) const
+QVariant ItemGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::ItemGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::ItemGroupModel::setData(const QVariant& value, int role)
+bool ItemGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::ItemGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::ItemGroupModel::types() const
+QString ItemGroupModel::types() const
 {
     return "Item";
 }
 
-void Sigmodr::Tree::ItemGroupModel::addObject(Sigmod::Object* object)
+void ItemGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newItem();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::ItemGroupModel::addObject(Sigmod::Object* object)
         addChild(new ItemModel(this, qobject_cast<Sigmod::Item*>(object)));
 }
 
-void Sigmodr::Tree::ItemGroupModel::deleteObject(BaseModel* model)
+void ItemGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/ItemModel.cpp b/sigmodr/tree/ItemModel.cpp
index e917d020..eb9402d3 100644
--- a/sigmodr/tree/ItemModel.cpp
+++ b/sigmodr/tree/ItemModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::ItemModel::ItemModel(BaseModel* parent, Sigmod::Item* item) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+ItemModel::ItemModel(BaseModel* parent, Sigmod::Item* item) :
         ObjectModel(parent, item)
 {
 }
 
-QVariant Sigmodr::Tree::ItemModel::data(int role) const
+QVariant ItemModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Item*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::ItemModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::ItemModel::deleteSelf()
+void ItemModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/ItemTypeGroupModel.cpp b/sigmodr/tree/ItemTypeGroupModel.cpp
index 560c2bb0..617cf726 100644
--- a/sigmodr/tree/ItemTypeGroupModel.cpp
+++ b/sigmodr/tree/ItemTypeGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::ItemTypeGroupModel::ItemTypeGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+ItemTypeGroupModel::ItemTypeGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Item Types")
 {
     for (int i = 0; i < game->itemTypeCount(); ++i)
         addObject(game->itemType(i));
 }
 
-QVariant Sigmodr::Tree::ItemTypeGroupModel::data(const int role) const
+QVariant ItemTypeGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::ItemTypeGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::ItemTypeGroupModel::setData(const QVariant& value, int role)
+bool ItemTypeGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::ItemTypeGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::ItemTypeGroupModel::types() const
+QString ItemTypeGroupModel::types() const
 {
     return "ItemType";
 }
 
-void Sigmodr::Tree::ItemTypeGroupModel::addObject(Sigmod::Object* object)
+void ItemTypeGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newItemType();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::ItemTypeGroupModel::addObject(Sigmod::Object* object)
         addChild(new ItemTypeModel(this, qobject_cast<Sigmod::ItemType*>(object)));
 }
 
-void Sigmodr::Tree::ItemTypeGroupModel::deleteObject(BaseModel* model)
+void ItemTypeGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/ItemTypeModel.cpp b/sigmodr/tree/ItemTypeModel.cpp
index f09a1be8..26d6299d 100644
--- a/sigmodr/tree/ItemTypeModel.cpp
+++ b/sigmodr/tree/ItemTypeModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::ItemTypeModel::ItemTypeModel(BaseModel* parent, Sigmod::ItemType* itemType) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+ItemTypeModel::ItemTypeModel(BaseModel* parent, Sigmod::ItemType* itemType) :
         ObjectModel(parent, itemType)
 {
 }
 
-QVariant Sigmodr::Tree::ItemTypeModel::data(int role) const
+QVariant ItemTypeModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::ItemType*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::ItemTypeModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::ItemTypeModel::deleteSelf()
+void ItemTypeModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/MapEffectGroupModel.cpp b/sigmodr/tree/MapEffectGroupModel.cpp
index c1078791..a6f1b347 100644
--- a/sigmodr/tree/MapEffectGroupModel.cpp
+++ b/sigmodr/tree/MapEffectGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapEffectGroupModel::MapEffectGroupModel(BaseModel* parent, Sigmod::Map* map) :
+using namespace Sigmodr::Tree;
+
+MapEffectGroupModel::MapEffectGroupModel(BaseModel* parent, Sigmod::Map* map) :
         GroupModel(parent, map, "Effects")
 {
     for (int i = 0; i < map->effectCount(); ++i)
         addObject(map->effect(i));
 }
 
-QVariant Sigmodr::Tree::MapEffectGroupModel::data(const int role) const
+QVariant MapEffectGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::MapEffectGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::MapEffectGroupModel::setData(const QVariant& value, int role)
+bool MapEffectGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::MapEffectGroupModel::setData(const QVariant& value, int role
     return false;
 }
 
-QString Sigmodr::Tree::MapEffectGroupModel::types() const
+QString MapEffectGroupModel::types() const
 {
     return "MapEffect";
 }
 
-void Sigmodr::Tree::MapEffectGroupModel::addObject(Sigmod::Object* object)
+void MapEffectGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Map*>(m_object)->newEffect();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::MapEffectGroupModel::addObject(Sigmod::Object* object)
         addChild(new MapEffectModel(this, qobject_cast<Sigmod::MapEffect*>(object)));
 }
 
-void Sigmodr::Tree::MapEffectGroupModel::deleteObject(BaseModel* model)
+void MapEffectGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/MapEffectModel.cpp b/sigmodr/tree/MapEffectModel.cpp
index 6836725f..02ca7930 100644
--- a/sigmodr/tree/MapEffectModel.cpp
+++ b/sigmodr/tree/MapEffectModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapEffectModel::MapEffectModel(BaseModel* parent, Sigmod::MapEffect* effect) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapEffectModel::MapEffectModel(BaseModel* parent, Sigmod::MapEffect* effect) :
         ObjectModel(parent, effect)
 {
 }
 
-QVariant Sigmodr::Tree::MapEffectModel::data(int role) const
+QVariant MapEffectModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::MapEffect*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::MapEffectModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::MapEffectModel::deleteSelf()
+void MapEffectModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/MapGroupModel.cpp b/sigmodr/tree/MapGroupModel.cpp
index 784873b9..059e6fb8 100644
--- a/sigmodr/tree/MapGroupModel.cpp
+++ b/sigmodr/tree/MapGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapGroupModel::MapGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+MapGroupModel::MapGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Maps")
 {
     for (int i = 0; i < game->mapCount(); ++i)
         addObject(game->map(i));
 }
 
-QVariant Sigmodr::Tree::MapGroupModel::data(const int role) const
+QVariant MapGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::MapGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::MapGroupModel::setData(const QVariant& value, int role)
+bool MapGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::MapGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MapGroupModel::types() const
+QString MapGroupModel::types() const
 {
     return "Map";
 }
 
-void Sigmodr::Tree::MapGroupModel::addObject(Sigmod::Object* object)
+void MapGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newMap();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::MapGroupModel::addObject(Sigmod::Object* object)
         addChild(new MapModel(this, qobject_cast<Sigmod::Map*>(object)));
 }
 
-void Sigmodr::Tree::MapGroupModel::deleteObject(BaseModel* model)
+void MapGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/MapModel.cpp b/sigmodr/tree/MapModel.cpp
index e662400b..2a328007 100644
--- a/sigmodr/tree/MapModel.cpp
+++ b/sigmodr/tree/MapModel.cpp
@@ -33,18 +33,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapModel::MapModel(BaseModel* parent, Sigmod::Map* map) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapModel::MapModel(BaseModel* parent, Sigmod::Map* map) :
         GroupObjectModel(parent, map)
 {
     setupData();
 }
 
-Sigmodr::Tree::MapModel::~MapModel()
+MapModel::~MapModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::MapModel::data(int role) const
+QVariant MapModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Map*>(m_object)->name();
@@ -68,7 +71,7 @@ QVariant Sigmodr::Tree::MapModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::MapModel::setData(const QVariant& value, int role)
+bool MapModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -97,27 +100,27 @@ bool Sigmodr::Tree::MapModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MapModel::types() const
+QString MapModel::types() const
 {
     return type().append(QString(";MapEffect;MapTrainer;MapWarp;MapWildList"));
 }
 
-void Sigmodr::Tree::MapModel::addObject(Sigmod::Object* object)
+void MapModel::addObject(Sigmod::Object* object)
 {
     Q_UNUSED(object)
 }
 
-void Sigmodr::Tree::MapModel::deleteObject(BaseModel* model)
+void MapModel::deleteObject(BaseModel* model)
 {
     Q_UNUSED(model)
 }
 
-void Sigmodr::Tree::MapModel::deleteSelf()
+void MapModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void Sigmodr::Tree::MapModel::setupData()
+void MapModel::setupData()
 {
     Sigmod::Map* map = qobject_cast<Sigmod::Map*>(m_object);
     addChild(new MapEffectGroupModel(this, map));
diff --git a/sigmodr/tree/MapTrainerGroupModel.cpp b/sigmodr/tree/MapTrainerGroupModel.cpp
index 5b508149..2355bf79 100644
--- a/sigmodr/tree/MapTrainerGroupModel.cpp
+++ b/sigmodr/tree/MapTrainerGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapTrainerGroupModel::MapTrainerGroupModel(BaseModel* parent, Sigmod::Map* map) :
+using namespace Sigmodr::Tree;
+
+MapTrainerGroupModel::MapTrainerGroupModel(BaseModel* parent, Sigmod::Map* map) :
         GroupModel(parent, map, "Trainers")
 {
     for (int i = 0; i < map->trainerCount(); ++i)
         addObject(map->trainer(i));
 }
 
-QVariant Sigmodr::Tree::MapTrainerGroupModel::data(const int role) const
+QVariant MapTrainerGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::MapTrainerGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::MapTrainerGroupModel::setData(const QVariant& value, int role)
+bool MapTrainerGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::MapTrainerGroupModel::setData(const QVariant& value, int rol
     return false;
 }
 
-QString Sigmodr::Tree::MapTrainerGroupModel::types() const
+QString MapTrainerGroupModel::types() const
 {
     return "MapTrainer";
 }
 
-void Sigmodr::Tree::MapTrainerGroupModel::addObject(Sigmod::Object* object)
+void MapTrainerGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Map*>(m_object)->newTrainer();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::MapTrainerGroupModel::addObject(Sigmod::Object* object)
         addChild(new MapTrainerModel(this, qobject_cast<Sigmod::MapTrainer*>(object)));
 }
 
-void Sigmodr::Tree::MapTrainerGroupModel::deleteObject(BaseModel* model)
+void MapTrainerGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/MapTrainerModel.cpp b/sigmodr/tree/MapTrainerModel.cpp
index 3baac436..3154cfe5 100644
--- a/sigmodr/tree/MapTrainerModel.cpp
+++ b/sigmodr/tree/MapTrainerModel.cpp
@@ -33,18 +33,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapTrainerModel::MapTrainerModel(BaseModel* parent, Sigmod::MapTrainer* trainer) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapTrainerModel::MapTrainerModel(BaseModel* parent, Sigmod::MapTrainer* trainer) :
         GroupObjectModel(parent, trainer)
 {
     setupData();
 }
 
-Sigmodr::Tree::MapTrainerModel::~MapTrainerModel()
+MapTrainerModel::~MapTrainerModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::MapTrainerModel::data(int role) const
+QVariant MapTrainerModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::MapTrainer*>(m_object)->name();
@@ -70,7 +73,7 @@ QVariant Sigmodr::Tree::MapTrainerModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::MapTrainerModel::setData(const QVariant& value, int role)
+bool MapTrainerModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -98,12 +101,12 @@ bool Sigmodr::Tree::MapTrainerModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MapTrainerModel::types() const
+QString MapTrainerModel::types() const
 {
     return type().append(QString(";MapTrainerTeamMember"));
 }
 
-void Sigmodr::Tree::MapTrainerModel::addObject(Sigmod::Object* object)
+void MapTrainerModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::MapTrainer*>(m_object)->newTeamMember();
@@ -111,7 +114,7 @@ void Sigmodr::Tree::MapTrainerModel::addObject(Sigmod::Object* object)
         addChild(new MapTrainerTeamMemberModel(this, qobject_cast<Sigmod::MapTrainerTeamMember*>(object)));
 }
 
-void Sigmodr::Tree::MapTrainerModel::deleteObject(BaseModel* model)
+void MapTrainerModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
@@ -123,12 +126,12 @@ void Sigmodr::Tree::MapTrainerModel::deleteObject(BaseModel* model)
     }
 }
 
-void Sigmodr::Tree::MapTrainerModel::deleteSelf()
+void MapTrainerModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void Sigmodr::Tree::MapTrainerModel::setupData()
+void MapTrainerModel::setupData()
 {
     Sigmod::MapTrainer* trainer = qobject_cast<Sigmod::MapTrainer*>(m_object);
     for (int i = 0; i < trainer->teamMemberCount(); ++i)
diff --git a/sigmodr/tree/MapTrainerTeamMemberModel.cpp b/sigmodr/tree/MapTrainerTeamMemberModel.cpp
index 3e4fb22c..2e49a91c 100644
--- a/sigmodr/tree/MapTrainerTeamMemberModel.cpp
+++ b/sigmodr/tree/MapTrainerTeamMemberModel.cpp
@@ -33,12 +33,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, Sigmod::MapTrainerTeamMember* teamMember) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, Sigmod::MapTrainerTeamMember* teamMember) :
         ObjectModel(parent, teamMember)
 {
 }
 
-QVariant Sigmodr::Tree::MapTrainerTeamMemberModel::data(int role) const
+QVariant MapTrainerTeamMemberModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
     {
@@ -67,7 +70,7 @@ QVariant Sigmodr::Tree::MapTrainerTeamMemberModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::MapTrainerTeamMemberModel::deleteSelf()
+void MapTrainerTeamMemberModel::deleteSelf()
 {
     qobject_cast<GroupObjectModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/MapWarpGroupModel.cpp b/sigmodr/tree/MapWarpGroupModel.cpp
index 86f66492..8a42d207 100644
--- a/sigmodr/tree/MapWarpGroupModel.cpp
+++ b/sigmodr/tree/MapWarpGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapWarpGroupModel::MapWarpGroupModel(BaseModel* parent, Sigmod::Map* map) :
+using namespace Sigmodr::Tree;
+
+MapWarpGroupModel::MapWarpGroupModel(BaseModel* parent, Sigmod::Map* map) :
         GroupModel(parent, map, "Warps")
 {
     for (int i = 0; i < map->warpCount(); ++i)
         addObject(map->warp(i));
 }
 
-QVariant Sigmodr::Tree::MapWarpGroupModel::data(const int role) const
+QVariant MapWarpGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::MapWarpGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::MapWarpGroupModel::setData(const QVariant& value, int role)
+bool MapWarpGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::MapWarpGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MapWarpGroupModel::types() const
+QString MapWarpGroupModel::types() const
 {
     return "MapWarp";
 }
 
-void Sigmodr::Tree::MapWarpGroupModel::addObject(Sigmod::Object* object)
+void MapWarpGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Map*>(m_object)->newWarp();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::MapWarpGroupModel::addObject(Sigmod::Object* object)
         addChild(new MapWarpModel(this, qobject_cast<Sigmod::MapWarp*>(object)));
 }
 
-void Sigmodr::Tree::MapWarpGroupModel::deleteObject(BaseModel* model)
+void MapWarpGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/MapWarpModel.cpp b/sigmodr/tree/MapWarpModel.cpp
index e87fac4b..6d319783 100644
--- a/sigmodr/tree/MapWarpModel.cpp
+++ b/sigmodr/tree/MapWarpModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapWarpModel::MapWarpModel(BaseModel* parent, Sigmod::MapWarp* warp) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapWarpModel::MapWarpModel(BaseModel* parent, Sigmod::MapWarp* warp) :
         ObjectModel(parent, warp)
 {
 }
 
-QVariant Sigmodr::Tree::MapWarpModel::data(int role) const
+QVariant MapWarpModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::MapWarp*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::MapWarpModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::MapWarpModel::deleteSelf()
+void MapWarpModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/MapWildListEncounterModel.cpp b/sigmodr/tree/MapWildListEncounterModel.cpp
index 262c123a..90a2227c 100644
--- a/sigmodr/tree/MapWildListEncounterModel.cpp
+++ b/sigmodr/tree/MapWildListEncounterModel.cpp
@@ -33,12 +33,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapWildListEncounterModel::MapWildListEncounterModel(BaseModel* parent, Sigmod::MapWildListEncounter* encounter) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapWildListEncounterModel::MapWildListEncounterModel(BaseModel* parent, Sigmod::MapWildListEncounter* encounter) :
         ObjectModel(parent, encounter)
 {
 }
 
-QVariant Sigmodr::Tree::MapWildListEncounterModel::data(int role) const
+QVariant MapWildListEncounterModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
     {
@@ -67,7 +70,7 @@ QVariant Sigmodr::Tree::MapWildListEncounterModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::MapWildListEncounterModel::deleteSelf()
+void MapWildListEncounterModel::deleteSelf()
 {
     qobject_cast<GroupObjectModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/MapWildListGroupModel.cpp b/sigmodr/tree/MapWildListGroupModel.cpp
index 73525ad6..05155bc1 100644
--- a/sigmodr/tree/MapWildListGroupModel.cpp
+++ b/sigmodr/tree/MapWildListGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapWildListGroupModel::MapWildListGroupModel(BaseModel* parent, Sigmod::Map* map) :
+using namespace Sigmodr::Tree;
+
+MapWildListGroupModel::MapWildListGroupModel(BaseModel* parent, Sigmod::Map* map) :
         GroupModel(parent, map, "Wild Lists")
 {
     for (int i = 0; i < map->wildListCount(); ++i)
         addObject(map->wildList(i));
 }
 
-QVariant Sigmodr::Tree::MapWildListGroupModel::data(const int role) const
+QVariant MapWildListGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::MapWildListGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::MapWildListGroupModel::setData(const QVariant& value, int role)
+bool MapWildListGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::MapWildListGroupModel::setData(const QVariant& value, int ro
     return false;
 }
 
-QString Sigmodr::Tree::MapWildListGroupModel::types() const
+QString MapWildListGroupModel::types() const
 {
     return "MapWildList";
 }
 
-void Sigmodr::Tree::MapWildListGroupModel::addObject(Sigmod::Object* object)
+void MapWildListGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Map*>(m_object)->newWildList();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::MapWildListGroupModel::addObject(Sigmod::Object* object)
         addChild(new MapWildListModel(this, qobject_cast<Sigmod::MapWildList*>(object)));
 }
 
-void Sigmodr::Tree::MapWildListGroupModel::deleteObject(BaseModel* model)
+void MapWildListGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/MapWildListModel.cpp b/sigmodr/tree/MapWildListModel.cpp
index 8f3c0eb1..a795401d 100644
--- a/sigmodr/tree/MapWildListModel.cpp
+++ b/sigmodr/tree/MapWildListModel.cpp
@@ -33,18 +33,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapWildListModel::MapWildListModel(BaseModel* parent, Sigmod::MapWildList* wildList) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapWildListModel::MapWildListModel(BaseModel* parent, Sigmod::MapWildList* wildList) :
         GroupObjectModel(parent, wildList)
 {
     setupData();
 }
 
-Sigmodr::Tree::MapWildListModel::~MapWildListModel()
+MapWildListModel::~MapWildListModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::MapWildListModel::data(int role) const
+QVariant MapWildListModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
     {
@@ -72,7 +75,7 @@ QVariant Sigmodr::Tree::MapWildListModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::MapWildListModel::setData(const QVariant& value, int role)
+bool MapWildListModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -100,12 +103,12 @@ bool Sigmodr::Tree::MapWildListModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MapWildListModel::types() const
+QString MapWildListModel::types() const
 {
     return type().append(QString(";MapWildListEncounter"));
 }
 
-void Sigmodr::Tree::MapWildListModel::addObject(Sigmod::Object* object)
+void MapWildListModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::MapWildList*>(m_object)->newEncounter();
@@ -113,7 +116,7 @@ void Sigmodr::Tree::MapWildListModel::addObject(Sigmod::Object* object)
         addChild(new MapWildListEncounterModel(this, qobject_cast<Sigmod::MapWildListEncounter*>(object)));
 }
 
-void Sigmodr::Tree::MapWildListModel::deleteObject(BaseModel* model)
+void MapWildListModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
@@ -125,12 +128,12 @@ void Sigmodr::Tree::MapWildListModel::deleteObject(BaseModel* model)
     }
 }
 
-void Sigmodr::Tree::MapWildListModel::deleteSelf()
+void MapWildListModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void Sigmodr::Tree::MapWildListModel::setupData()
+void MapWildListModel::setupData()
 {
     Sigmod::MapWildList* wildList = qobject_cast<Sigmod::MapWildList*>(m_object);
     for (int i = 0; i < wildList->encounterCount(); ++i)
diff --git a/sigmodr/tree/MoveGroupModel.cpp b/sigmodr/tree/MoveGroupModel.cpp
index 29521f46..14cc8be7 100644
--- a/sigmodr/tree/MoveGroupModel.cpp
+++ b/sigmodr/tree/MoveGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MoveGroupModel::MoveGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+MoveGroupModel::MoveGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Moves")
 {
     for (int i = 0; i < game->moveCount(); ++i)
         addObject(game->move(i));
 }
 
-QVariant Sigmodr::Tree::MoveGroupModel::data(const int role) const
+QVariant MoveGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::MoveGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::MoveGroupModel::setData(const QVariant& value, int role)
+bool MoveGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::MoveGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MoveGroupModel::types() const
+QString MoveGroupModel::types() const
 {
     return "Move";
 }
 
-void Sigmodr::Tree::MoveGroupModel::addObject(Sigmod::Object* object)
+void MoveGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newMove();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::MoveGroupModel::addObject(Sigmod::Object* object)
         addChild(new MoveModel(this, qobject_cast<Sigmod::Move*>(object)));
 }
 
-void Sigmodr::Tree::MoveGroupModel::deleteObject(BaseModel* model)
+void MoveGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/MoveModel.cpp b/sigmodr/tree/MoveModel.cpp
index 0e5d5738..552e5712 100644
--- a/sigmodr/tree/MoveModel.cpp
+++ b/sigmodr/tree/MoveModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MoveModel::MoveModel(BaseModel* parent, Sigmod::Move* move) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MoveModel::MoveModel(BaseModel* parent, Sigmod::Move* move) :
         ObjectModel(parent, move)
 {
 }
 
-QVariant Sigmodr::Tree::MoveModel::data(int role) const
+QVariant MoveModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Move*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::MoveModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::MoveModel::deleteSelf()
+void MoveModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/NatureGroupModel.cpp b/sigmodr/tree/NatureGroupModel.cpp
index 9657b324..37031262 100644
--- a/sigmodr/tree/NatureGroupModel.cpp
+++ b/sigmodr/tree/NatureGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::NatureGroupModel::NatureGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+NatureGroupModel::NatureGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Natures")
 {
     for (int i = 0; i < game->natureCount(); ++i)
         addObject(game->nature(i));
 }
 
-QVariant Sigmodr::Tree::NatureGroupModel::data(const int role) const
+QVariant NatureGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::NatureGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::NatureGroupModel::setData(const QVariant& value, int role)
+bool NatureGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::NatureGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::NatureGroupModel::types() const
+QString NatureGroupModel::types() const
 {
     return "Nature";
 }
 
-void Sigmodr::Tree::NatureGroupModel::addObject(Sigmod::Object* object)
+void NatureGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newNature();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::NatureGroupModel::addObject(Sigmod::Object* object)
         addChild(new NatureModel(this, qobject_cast<Sigmod::Nature*>(object)));
 }
 
-void Sigmodr::Tree::NatureGroupModel::deleteObject(BaseModel* model)
+void NatureGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/NatureModel.cpp b/sigmodr/tree/NatureModel.cpp
index b904bd34..b41e06f0 100644
--- a/sigmodr/tree/NatureModel.cpp
+++ b/sigmodr/tree/NatureModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::NatureModel::NatureModel(BaseModel* parent, Sigmod::Nature* nature) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+NatureModel::NatureModel(BaseModel* parent, Sigmod::Nature* nature) :
         ObjectModel(parent, nature)
 {
 }
 
-QVariant Sigmodr::Tree::NatureModel::data(int role) const
+QVariant NatureModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Nature*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::NatureModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::NatureModel::deleteSelf()
+void NatureModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/ObjectModel.cpp b/sigmodr/tree/ObjectModel.cpp
index 1476a1b0..ceaa5898 100644
--- a/sigmodr/tree/ObjectModel.cpp
+++ b/sigmodr/tree/ObjectModel.cpp
@@ -24,26 +24,28 @@
 // Qt includes
 #include <QtXml/QDomDocument>
 
-Sigmodr::Tree::ObjectModel::ObjectModel(BaseModel* parent, Sigmod::Object* object) :
+using namespace Sigmodr::Tree;
+
+ObjectModel::ObjectModel(BaseModel* parent, Sigmod::Object* object) :
         BaseObjectModel(parent, object)
 {
 }
 
-Sigmodr::Tree::ObjectModel::~ObjectModel()
+ObjectModel::~ObjectModel()
 {
 }
 
-int Sigmodr::Tree::ObjectModel::rowCount() const
+int ObjectModel::rowCount() const
 {
     return 0;
 }
 
-QVariant Sigmodr::Tree::ObjectModel::data(int role) const
+QVariant ObjectModel::data(int role) const
 {
     return BaseObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::ObjectModel::setData(const QVariant& value, int role)
+bool ObjectModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -61,13 +63,13 @@ bool Sigmodr::Tree::ObjectModel::setData(const QVariant& value, int role)
     return false;
 }
 
-Sigmodr::Tree::BaseModel* Sigmodr::Tree::ObjectModel::childItem(const int row)
+BaseModel* ObjectModel::childItem(const int row)
 {
     Q_UNUSED(row)
     return NULL;
 }
 
-QString Sigmodr::Tree::ObjectModel::types() const
+QString ObjectModel::types() const
 {
     return type();
 }
diff --git a/sigmodr/tree/RootModel.cpp b/sigmodr/tree/RootModel.cpp
index 76202045..55dc71c9 100644
--- a/sigmodr/tree/RootModel.cpp
+++ b/sigmodr/tree/RootModel.cpp
@@ -24,24 +24,26 @@
 // Sigmod includes
 #include <sigmod/Game.h>
 
-Sigmodr::Tree::RootModel::RootModel() :
+using namespace Sigmodr::Tree;
+
+RootModel::RootModel() :
         GroupModel(NULL, NULL)
 {
 }
 
-bool Sigmodr::Tree::RootModel::setData(const QVariant& value, int role)
+bool RootModel::setData(const QVariant& value, int role)
 {
     Q_UNUSED(value)
     Q_UNUSED(role)
     return false;
 }
 
-void Sigmodr::Tree::RootModel::addGame(Sigmod::Game* game)
+void RootModel::addGame(Sigmod::Game* game)
 {
-    addChild(new SigmodModel(this, game));
+    addChild(new GameModel(this, game));
 }
 
-void Sigmodr::Tree::RootModel::deleteGame(const Sigmod::Game* game)
+void RootModel::deleteGame(const Sigmod::Game* game)
 {
     for (int i = 0; i < m_objects.size(); ++i)
     {
@@ -54,17 +56,17 @@ void Sigmodr::Tree::RootModel::deleteGame(const Sigmod::Game* game)
     }
 }
 
-QString Sigmodr::Tree::RootModel::types() const
+QString RootModel::types() const
 {
     return "Sigmod";
 }
 
-void Sigmodr::Tree::RootModel::addObject(Sigmod::Object* object)
+void RootModel::addObject(Sigmod::Object* object)
 {
     Q_UNUSED(object)
 }
 
-void Sigmodr::Tree::RootModel::deleteObject(BaseModel* model)
+void RootModel::deleteObject(BaseModel* model)
 {
     Q_UNUSED(model)
 }
diff --git a/sigmodr/tree/RootModel.h b/sigmodr/tree/RootModel.h
index 87597042..94e91aea 100644
--- a/sigmodr/tree/RootModel.h
+++ b/sigmodr/tree/RootModel.h
@@ -21,11 +21,16 @@
 // Sigmodr tree includes
 #include "GroupModel.h"
 
+// Forward declarations
+namespace Sigmod
+{
+class Game;
+}
+
 namespace Sigmodr
 {
 namespace Tree
 {
-// Forward declarations
 class GameModel;
 
 class SIGMODRTREE_IMPORT RootModel : public GroupModel
diff --git a/sigmodr/tree/RulesModel.cpp b/sigmodr/tree/RulesModel.cpp
index c75fa4ac..90190baf 100644
--- a/sigmodr/tree/RulesModel.cpp
+++ b/sigmodr/tree/RulesModel.cpp
@@ -27,12 +27,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::RulesModel::RulesModel(BaseModel* parent, Sigmod::Rules* rules) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+RulesModel::RulesModel(BaseModel* parent, Sigmod::Rules* rules) :
         ObjectModel(parent, rules)
 {
 }
 
-QVariant Sigmodr::Tree::RulesModel::data(int role) const
+QVariant RulesModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return m_object->className();
@@ -55,6 +58,6 @@ QVariant Sigmodr::Tree::RulesModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::RulesModel::deleteSelf()
+void RulesModel::deleteSelf()
 {
 }
diff --git a/sigmodr/tree/SigmodrTree.cpp b/sigmodr/tree/SigmodrTree.cpp
index 63cc5a4c..f7e9790e 100644
--- a/sigmodr/tree/SigmodrTree.cpp
+++ b/sigmodr/tree/SigmodrTree.cpp
@@ -32,7 +32,9 @@
 // Qt includes
 #include <QtGui/QHeaderView>
 
-Sigmodr::Tree::SigmodrTree::SigmodrTree(QWidget* parent) :
+using namespace Sigmodr::Tree;
+
+SigmodrTree::SigmodrTree(QWidget* parent) :
         QTreeView(parent)
 {
     SigmodrTreeModel* model = new SigmodrTreeModel(this);
@@ -42,7 +44,7 @@ Sigmodr::Tree::SigmodrTree::SigmodrTree(QWidget* parent) :
     setRootIndex(model->index(-1, 0, QModelIndex()));
 }
 
-QString Sigmodr::Tree::SigmodrTree::description(const QModelIndex& index)
+QString SigmodrTree::description(const QModelIndex& index)
 {
     QString type = model()->data(index, BaseModel::TypeRole).toString();
     QString name = model()->data(index, Qt::DisplayRole).toString();
@@ -51,18 +53,18 @@ QString Sigmodr::Tree::SigmodrTree::description(const QModelIndex& index)
     return QString("%1: %2").arg(type).arg(name);
 }
 
-Sigmodr::Widgets::ObjectUI* Sigmodr::Tree::SigmodrTree::editorWidget(const QModelIndex& index)
+Sigmodr::Widgets::ObjectUI* SigmodrTree::editorWidget(const QModelIndex& index)
 {
     Widgets::ObjectUI* widget = qobject_cast<Widgets::ObjectUI*>(model()->data(index, BaseModel::WidgetRole).value<QWidget*>());
     return widget;
 }
 
-KMenu* Sigmodr::Tree::SigmodrTree::contextMenu(const QModelIndex& index)
+KMenu* SigmodrTree::contextMenu(const QModelIndex& index)
 {
     return model()->data(index, BaseModel::ContextMenuRole).value<KMenu*>();
 }
 
-const Sigmod::Game* Sigmodr::Tree::SigmodrTree::currentGame() const
+const Sigmod::Game* SigmodrTree::currentGame() const
 {
     QModelIndex index = currentIndex();
     if (index.isValid())
@@ -74,30 +76,30 @@ const Sigmod::Game* Sigmodr::Tree::SigmodrTree::currentGame() const
     return NULL;
 }
 
-QDomDocument Sigmodr::Tree::SigmodrTree::copy(const QModelIndex& index)
+QDomDocument SigmodrTree::copy(const QModelIndex& index)
 {
     QDomDocument xml;
     xml.setContent(model()->data(index, BaseModel::XmlRole).toString());
     return xml;
 }
 
-void Sigmodr::Tree::SigmodrTree::paste(const QModelIndex& index, const QDomDocument& data)
+void SigmodrTree::paste(const QModelIndex& index, const QDomDocument& data)
 {
     model()->setData(index, data.toString(), BaseModel::XmlRole);
 }
 
-QList<const Sigmod::Game*> Sigmodr::Tree::SigmodrTree::openedGames() const
+QList<const Sigmod::Game*> SigmodrTree::openedGames() const
 {
     return m_games.keys();
 }
 
-void Sigmodr::Tree::SigmodrTree::addSigmod(Sigmod::Game* game, const KUrl& url)
+void SigmodrTree::addGame(Sigmod::Game* game, const KUrl& url)
 {
     qobject_cast<SigmodrTreeModel*>(model())->addGame(game);
     m_games[game] = UrlDirty(url, false);
 }
 
-void Sigmodr::Tree::SigmodrTree::deleteSigmod(const Sigmod::Game* game)
+void SigmodrTree::deleteGame(const Sigmod::Game* game)
 {
     if (m_games.contains(game))
     {
@@ -106,7 +108,7 @@ void Sigmodr::Tree::SigmodrTree::deleteSigmod(const Sigmod::Game* game)
     }
 }
 
-bool Sigmodr::Tree::SigmodrTree::isOpen(const KUrl& url) const
+bool SigmodrTree::isOpen(const KUrl& url) const
 {
     foreach (const UrlDirty& pair, m_games.values())
     {
@@ -116,14 +118,14 @@ bool Sigmodr::Tree::SigmodrTree::isOpen(const KUrl& url) const
     return false;
 }
 
-KUrl Sigmodr::Tree::SigmodrTree::url(const Sigmod::Game* game) const
+KUrl SigmodrTree::url(const Sigmod::Game* game) const
 {
     if (m_games.contains(game))
         return m_games[game].first;
     return KUrl();
 }
 
-QStringList Sigmodr::Tree::SigmodrTree::urls() const
+QStringList SigmodrTree::urls() const
 {
     QStringList urls;
     foreach (const UrlDirty& pair, m_games.values())
@@ -131,31 +133,31 @@ QStringList Sigmodr::Tree::SigmodrTree::urls() const
     return urls;
 }
 
-void Sigmodr::Tree::SigmodrTree::setUrl(const Sigmod::Game* game, const KUrl& url)
+void SigmodrTree::setUrl(const Sigmod::Game* game, const KUrl& url)
 {
     if (m_games.contains(game))
         m_games[game] = UrlDirty(url, false);
 }
 
-bool Sigmodr::Tree::SigmodrTree::dirty(const Sigmod::Game* game) const
+bool SigmodrTree::dirty(const Sigmod::Game* game) const
 {
     if (m_games.contains(game))
         return m_games[game].second;
     return false;
 }
 
-bool Sigmodr::Tree::SigmodrTree::dirty() const
+bool SigmodrTree::dirty() const
 {
-    return dirty(currentSigmod());
+    return dirty(currentGame());
 }
 
-void Sigmodr::Tree::SigmodrTree::setDirty(const Sigmod::Game* game, const bool dirty)
+void SigmodrTree::setDirty(const Sigmod::Game* game, const bool dirty)
 {
     if (m_games.contains(game))
         m_games[game].second = dirty;
 }
 
-void Sigmodr::Tree::SigmodrTree::setDirty()
+void SigmodrTree::setDirty()
 {
-    setDirty(currentSigmod(), true);
+    setDirty(currentGame(), true);
 }
diff --git a/sigmodr/tree/SigmodrTreeModel.cpp b/sigmodr/tree/SigmodrTreeModel.cpp
index b3832a7b..39320840 100644
--- a/sigmodr/tree/SigmodrTreeModel.cpp
+++ b/sigmodr/tree/SigmodrTreeModel.cpp
@@ -30,19 +30,21 @@
 #include <QtCore/QUrl>
 #include <QtXml/QDomDocument>
 
-Sigmodr::Tree::SigmodrTreeModel::SigmodrTreeModel(QObject* parent) :
+using namespace Sigmodr::Tree;
+
+SigmodrTreeModel::SigmodrTreeModel(QObject* parent) :
         QAbstractItemModel(parent),
         m_root(new RootModel)
 {
     connect(m_root, SIGNAL(rowsChanged(QList<int>)), this, SLOT(rowsChanged(QList<int>)));
 }
 
-Sigmodr::Tree::SigmodrTreeModel::~SigmodrTreeModel()
+SigmodrTreeModel::~SigmodrTreeModel()
 {
     delete m_root;
 }
 
-QVariant Sigmodr::Tree::SigmodrTreeModel::data(const QModelIndex& index, int role) const
+QVariant SigmodrTreeModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return QVariant();
@@ -50,7 +52,7 @@ QVariant Sigmodr::Tree::SigmodrTreeModel::data(const QModelIndex& index, int rol
     return object->data(role);
 }
 
-QVariant Sigmodr::Tree::SigmodrTreeModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant SigmodrTreeModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     Q_UNUSED(section)
     Q_UNUSED(orientation)
@@ -58,7 +60,7 @@ QVariant Sigmodr::Tree::SigmodrTreeModel::headerData(int section, Qt::Orientatio
     return QVariant();
 }
 
-QModelIndex Sigmodr::Tree::SigmodrTreeModel::index(int row, int column, const QModelIndex& parent) const
+QModelIndex SigmodrTreeModel::index(int row, int column, const QModelIndex& parent) const
 {
     if ((row < -1) || (column < -1))
         return QModelIndex();
@@ -71,7 +73,7 @@ QModelIndex Sigmodr::Tree::SigmodrTreeModel::index(int row, int column, const QM
     return createIndex(row, 0, object);
 }
 
-QModelIndex Sigmodr::Tree::SigmodrTreeModel::parent(const QModelIndex& index) const
+QModelIndex SigmodrTreeModel::parent(const QModelIndex& index) const
 {
     if (!index.isValid())
         return QModelIndex();
@@ -81,19 +83,19 @@ QModelIndex Sigmodr::Tree::SigmodrTreeModel::parent(const QModelIndex& index) co
     return createIndex(parent->indexNumber(), 0, parent);
 }
 
-int Sigmodr::Tree::SigmodrTreeModel::rowCount(const QModelIndex& parent) const
+int SigmodrTreeModel::rowCount(const QModelIndex& parent) const
 {
     BaseModel* object = getItem(parent);
     return object->rowCount();
 }
 
-int Sigmodr::Tree::SigmodrTreeModel::columnCount(const QModelIndex& parent) const
+int SigmodrTreeModel::columnCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent)
     return 1;
 }
 
-Qt::ItemFlags Sigmodr::Tree::SigmodrTreeModel::flags(const QModelIndex& index) const
+Qt::ItemFlags SigmodrTreeModel::flags(const QModelIndex& index) const
 {
     if (!index.isValid())
         return 0;
@@ -101,7 +103,7 @@ Qt::ItemFlags Sigmodr::Tree::SigmodrTreeModel::flags(const QModelIndex& index) c
     return object->flags();
 }
 
-bool Sigmodr::Tree::SigmodrTreeModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool SigmodrTreeModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     if (!index.isValid())
         return false;
@@ -117,7 +119,7 @@ bool Sigmodr::Tree::SigmodrTreeModel::setData(const QModelIndex& index, const QV
     return success;
 }
 
-Sigmodr::Tree::BaseModel* Sigmodr::Tree::SigmodrTreeModel::getItem(const QModelIndex& index) const
+BaseModel* SigmodrTreeModel::getItem(const QModelIndex& index) const
 {
     if (index.isValid())
     {
@@ -128,12 +130,12 @@ Sigmodr::Tree::BaseModel* Sigmodr::Tree::SigmodrTreeModel::getItem(const QModelI
     return m_root;
 }
 
-QStringList Sigmodr::Tree::SigmodrTreeModel::mimeTypes() const
+QStringList SigmodrTreeModel::mimeTypes() const
 {
     return QStringList() << "application/x-sigmod+xml" << "text/uri-list";
 }
 
-QMimeData* Sigmodr::Tree::SigmodrTreeModel::mimeData(const QModelIndexList& indexes) const
+QMimeData* SigmodrTreeModel::mimeData(const QModelIndexList& indexes) const
 {
     QMimeData *mimeData = new QMimeData;
     if ((indexes.size() == 1) && indexes[0].isValid())
@@ -145,7 +147,7 @@ QMimeData* Sigmodr::Tree::SigmodrTreeModel::mimeData(const QModelIndexList& inde
     return mimeData;
 }
 
-bool Sigmodr::Tree::SigmodrTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+bool SigmodrTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
 {
     Q_UNUSED(row)
     Q_UNUSED(column)
@@ -175,19 +177,19 @@ bool Sigmodr::Tree::SigmodrTreeModel::dropMimeData(const QMimeData* data, Qt::Dr
     return success;
 }
 
-void Sigmodr::Tree::SigmodrTreeModel::addGame(Sigmod::Game* game)
+void SigmodrTreeModel::addGame(Sigmod::Game* game)
 {
-    m_root->addGame(sigmod);
+    m_root->addGame(game);
     reset();
 }
 
-void Sigmodr::Tree::SigmodrTreeModel::deleteGame(const Sigmod::Game* game)
+void SigmodrTreeModel::deleteGame(const Sigmod::Game* game)
 {
     m_root->deleteGame(game);
     reset();
 }
 
-const Sigmod::Game* Sigmodr::Tree::SigmodrTreeModel::findGame(const QModelIndex& index) const
+const Sigmod::Game* SigmodrTreeModel::findGame(const QModelIndex& index) const
 {
     QModelIndex curIndex = index;
     QModelIndex parIndex = parent(curIndex);
@@ -199,7 +201,7 @@ const Sigmod::Game* Sigmodr::Tree::SigmodrTreeModel::findGame(const QModelIndex&
     return qobject_cast<const Sigmod::Game*>(getItem(curIndex)->object());
 }
 
-void Sigmodr::Tree::SigmodrTreeModel::rowsChanged(const QList<int>& rows)
+void SigmodrTreeModel::rowsChanged(const QList<int>& rows)
 {
     QModelIndex curIndex;
     foreach (int row, rows)
diff --git a/sigmodr/tree/SkinGroupModel.cpp b/sigmodr/tree/SkinGroupModel.cpp
index c725ac07..ca2c925e 100644
--- a/sigmodr/tree/SkinGroupModel.cpp
+++ b/sigmodr/tree/SkinGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SkinGroupModel::SkinGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+SkinGroupModel::SkinGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Skins")
 {
     for (int i = 0; i < game->skinCount(); ++i)
         addObject(game->skin(i));
 }
 
-QVariant Sigmodr::Tree::SkinGroupModel::data(const int role) const
+QVariant SkinGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::SkinGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::SkinGroupModel::setData(const QVariant& value, int role)
+bool SkinGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::SkinGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::SkinGroupModel::types() const
+QString SkinGroupModel::types() const
 {
     return "Skin";
 }
 
-void Sigmodr::Tree::SkinGroupModel::addObject(Sigmod::Object* object)
+void SkinGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newSkin();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::SkinGroupModel::addObject(Sigmod::Object* object)
         addChild(new SkinModel(this, qobject_cast<Sigmod::Skin*>(object)));
 }
 
-void Sigmodr::Tree::SkinGroupModel::deleteObject(BaseModel* model)
+void SkinGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/SkinModel.cpp b/sigmodr/tree/SkinModel.cpp
index 4c57bdf5..a74c7440 100644
--- a/sigmodr/tree/SkinModel.cpp
+++ b/sigmodr/tree/SkinModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SkinModel::SkinModel(BaseModel* parent, Sigmod::Skin* skin) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+SkinModel::SkinModel(BaseModel* parent, Sigmod::Skin* skin) :
         ObjectModel(parent, skin)
 {
 }
 
-QVariant Sigmodr::Tree::SkinModel::data(int role) const
+QVariant SkinModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Skin*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::SkinModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::SkinModel::deleteSelf()
+void SkinModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/SoundGroupModel.cpp b/sigmodr/tree/SoundGroupModel.cpp
index 557cca5a..d5ef7c26 100644
--- a/sigmodr/tree/SoundGroupModel.cpp
+++ b/sigmodr/tree/SoundGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SoundGroupModel::SoundGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+SoundGroupModel::SoundGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Sounds")
 {
     for (int i = 0; i < game->soundCount(); ++i)
         addObject(game->sound(i));
 }
 
-QVariant Sigmodr::Tree::SoundGroupModel::data(const int role) const
+QVariant SoundGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::SoundGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::SoundGroupModel::setData(const QVariant& value, int role)
+bool SoundGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::SoundGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::SoundGroupModel::types() const
+QString SoundGroupModel::types() const
 {
     return "Sound";
 }
 
-void Sigmodr::Tree::SoundGroupModel::addObject(Sigmod::Object* object)
+void SoundGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newSound();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::SoundGroupModel::addObject(Sigmod::Object* object)
         addChild(new SoundModel(this, qobject_cast<Sigmod::Sound*>(object)));
 }
 
-void Sigmodr::Tree::SoundGroupModel::deleteObject(BaseModel* model)
+void SoundGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/SoundModel.cpp b/sigmodr/tree/SoundModel.cpp
index 923d5aa2..64233bc4 100644
--- a/sigmodr/tree/SoundModel.cpp
+++ b/sigmodr/tree/SoundModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SoundModel::SoundModel(BaseModel* parent, Sigmod::Sound* sound) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+SoundModel::SoundModel(BaseModel* parent, Sigmod::Sound* sound) :
         ObjectModel(parent, sound)
 {
 }
 
-QVariant Sigmodr::Tree::SoundModel::data(int role) const
+QVariant SoundModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Sound*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::SoundModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::SoundModel::deleteSelf()
+void SoundModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/SpeciesGroupModel.cpp b/sigmodr/tree/SpeciesGroupModel.cpp
index ade49e37..60aaaa5b 100644
--- a/sigmodr/tree/SpeciesGroupModel.cpp
+++ b/sigmodr/tree/SpeciesGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SpeciesGroupModel::SpeciesGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+SpeciesGroupModel::SpeciesGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Species")
 {
     for (int i = 0; i < game->speciesCount(); ++i)
         addObject(game->species(i));
 }
 
-QVariant Sigmodr::Tree::SpeciesGroupModel::data(const int role) const
+QVariant SpeciesGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::SpeciesGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::SpeciesGroupModel::setData(const QVariant& value, int role)
+bool SpeciesGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::SpeciesGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::SpeciesGroupModel::types() const
+QString SpeciesGroupModel::types() const
 {
     return "Species";
 }
 
-void Sigmodr::Tree::SpeciesGroupModel::addObject(Sigmod::Object* object)
+void SpeciesGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newSpecies();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::SpeciesGroupModel::addObject(Sigmod::Object* object)
         addChild(new SpeciesModel(this, qobject_cast<Sigmod::Species*>(object)));
 }
 
-void Sigmodr::Tree::SpeciesGroupModel::deleteObject(BaseModel* model)
+void SpeciesGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/SpeciesModel.cpp b/sigmodr/tree/SpeciesModel.cpp
index a48cd027..016fa6e3 100644
--- a/sigmodr/tree/SpeciesModel.cpp
+++ b/sigmodr/tree/SpeciesModel.cpp
@@ -33,18 +33,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SpeciesModel::SpeciesModel(BaseModel* parent, Sigmod::Species* species) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+SpeciesModel::SpeciesModel(BaseModel* parent, Sigmod::Species* species) :
         GroupObjectModel(parent, species)
 {
     setupData();
 }
 
-Sigmodr::Tree::SpeciesModel::~SpeciesModel()
+SpeciesModel::~SpeciesModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::SpeciesModel::data(int role) const
+QVariant SpeciesModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Species*>(m_object)->name();
@@ -70,7 +73,7 @@ QVariant Sigmodr::Tree::SpeciesModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::SpeciesModel::setData(const QVariant& value, int role)
+bool SpeciesModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -98,12 +101,12 @@ bool Sigmodr::Tree::SpeciesModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::SpeciesModel::types() const
+QString SpeciesModel::types() const
 {
     return type().append(QString(";SpeciesMove"));
 }
 
-void Sigmodr::Tree::SpeciesModel::addObject(Sigmod::Object* object)
+void SpeciesModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Species*>(m_object)->newMove();
@@ -111,7 +114,7 @@ void Sigmodr::Tree::SpeciesModel::addObject(Sigmod::Object* object)
         addChild(new SpeciesMoveModel(this, qobject_cast<Sigmod::SpeciesMove*>(object)));
 }
 
-void Sigmodr::Tree::SpeciesModel::deleteObject(BaseModel* model)
+void SpeciesModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
@@ -123,12 +126,12 @@ void Sigmodr::Tree::SpeciesModel::deleteObject(BaseModel* model)
     }
 }
 
-void Sigmodr::Tree::SpeciesModel::deleteSelf()
+void SpeciesModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void Sigmodr::Tree::SpeciesModel::setupData()
+void SpeciesModel::setupData()
 {
     Sigmod::Species* species = qobject_cast<Sigmod::Species*>(m_object);
     for (int i = 0; i < species->moveCount(); ++i)
diff --git a/sigmodr/tree/SpeciesMoveModel.cpp b/sigmodr/tree/SpeciesMoveModel.cpp
index 6ebd3875..e3488b41 100644
--- a/sigmodr/tree/SpeciesMoveModel.cpp
+++ b/sigmodr/tree/SpeciesMoveModel.cpp
@@ -33,12 +33,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SpeciesMoveModel::SpeciesMoveModel(BaseModel* parent, Sigmod::SpeciesMove* move) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+SpeciesMoveModel::SpeciesMoveModel(BaseModel* parent, Sigmod::SpeciesMove* move) :
         ObjectModel(parent, move)
 {
 }
 
-QVariant Sigmodr::Tree::SpeciesMoveModel::data(int role) const
+QVariant SpeciesMoveModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
     {
@@ -67,7 +70,7 @@ QVariant Sigmodr::Tree::SpeciesMoveModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::SpeciesMoveModel::deleteSelf()
+void SpeciesMoveModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/SpriteGroupModel.cpp b/sigmodr/tree/SpriteGroupModel.cpp
index df386275..91d942c0 100644
--- a/sigmodr/tree/SpriteGroupModel.cpp
+++ b/sigmodr/tree/SpriteGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SpriteGroupModel::SpriteGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+SpriteGroupModel::SpriteGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Sprites")
 {
     for (int i = 0; i < game->spriteCount(); ++i)
         addObject(game->sprite(i));
 }
 
-QVariant Sigmodr::Tree::SpriteGroupModel::data(const int role) const
+QVariant SpriteGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::SpriteGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::SpriteGroupModel::setData(const QVariant& value, int role)
+bool SpriteGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::SpriteGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::SpriteGroupModel::types() const
+QString SpriteGroupModel::types() const
 {
     return "Sprite";
 }
 
-void Sigmodr::Tree::SpriteGroupModel::addObject(Sigmod::Object* object)
+void SpriteGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newSprite();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::SpriteGroupModel::addObject(Sigmod::Object* object)
         addChild(new SpriteModel(this, qobject_cast<Sigmod::Sprite*>(object)));
 }
 
-void Sigmodr::Tree::SpriteGroupModel::deleteObject(BaseModel* model)
+void SpriteGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/SpriteModel.cpp b/sigmodr/tree/SpriteModel.cpp
index c8db347b..4b77cd5b 100644
--- a/sigmodr/tree/SpriteModel.cpp
+++ b/sigmodr/tree/SpriteModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::SpriteModel::SpriteModel(BaseModel* parent, Sigmod::Sprite* sprite) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+SpriteModel::SpriteModel(BaseModel* parent, Sigmod::Sprite* sprite) :
         ObjectModel(parent, sprite)
 {
 }
 
-QVariant Sigmodr::Tree::SpriteModel::data(int role) const
+QVariant SpriteModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Sprite*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::SpriteModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::SpriteModel::deleteSelf()
+void SpriteModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/StatusGroupModel.cpp b/sigmodr/tree/StatusGroupModel.cpp
index b1948288..c1718a9a 100644
--- a/sigmodr/tree/StatusGroupModel.cpp
+++ b/sigmodr/tree/StatusGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::StatusGroupModel::StatusGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+StatusGroupModel::StatusGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Status Effects")
 {
     for (int i = 0; i < game->statusCount(); ++i)
         addObject(game->status(i));
 }
 
-QVariant Sigmodr::Tree::StatusGroupModel::data(const int role) const
+QVariant StatusGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::StatusGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::StatusGroupModel::setData(const QVariant& value, int role)
+bool StatusGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::StatusGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::StatusGroupModel::types() const
+QString StatusGroupModel::types() const
 {
     return "Status";
 }
 
-void Sigmodr::Tree::StatusGroupModel::addObject(Sigmod::Object* object)
+void StatusGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newStatus();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::StatusGroupModel::addObject(Sigmod::Object* object)
         addChild(new StatusModel(this, qobject_cast<Sigmod::Status*>(object)));
 }
 
-void Sigmodr::Tree::StatusGroupModel::deleteObject(BaseModel* model)
+void StatusGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/StatusModel.cpp b/sigmodr/tree/StatusModel.cpp
index 2363940a..34afe928 100644
--- a/sigmodr/tree/StatusModel.cpp
+++ b/sigmodr/tree/StatusModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::StatusModel::StatusModel(BaseModel* parent, Sigmod::Status* status) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+StatusModel::StatusModel(BaseModel* parent, Sigmod::Status* status) :
         ObjectModel(parent, status)
 {
 }
 
-QVariant Sigmodr::Tree::StatusModel::data(int role) const
+QVariant StatusModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Status*>(m_object)->name();
@@ -50,7 +53,7 @@ QVariant Sigmodr::Tree::StatusModel::data(int role) const
         QWidget* widget = new StatusUI(qobject_cast<Sigmod::Status*>(m_object), NULL);
         return QVariant::fromValue(widget);
     }
-    else if (role == Sigmodr::Tree::BaseModel::ContextMenuRole)
+    else if (role == BaseModel::ContextMenuRole)
     {
         KMenu* menu = new KMenu;
         menu->addAction("&Delete Status", this, SLOT(deleteSelf()));
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::StatusModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::StatusModel::deleteSelf()
+void StatusModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/StoreGroupModel.cpp b/sigmodr/tree/StoreGroupModel.cpp
index 2b0f633c..eda076b9 100644
--- a/sigmodr/tree/StoreGroupModel.cpp
+++ b/sigmodr/tree/StoreGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::StoreGroupModel::StoreGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+StoreGroupModel::StoreGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Stores")
 {
     for (int i = 0; i < game->storeCount(); ++i)
         addObject(game->store(i));
 }
 
-QVariant Sigmodr::Tree::StoreGroupModel::data(const int role) const
+QVariant StoreGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::StoreGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::StoreGroupModel::setData(const QVariant& value, int role)
+bool StoreGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::StoreGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::StoreGroupModel::types() const
+QString StoreGroupModel::types() const
 {
     return "Store";
 }
 
-void Sigmodr::Tree::StoreGroupModel::addObject(Sigmod::Object* object)
+void StoreGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newStore();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::StoreGroupModel::addObject(Sigmod::Object* object)
         addChild(new StoreModel(this, qobject_cast<Sigmod::Store*>(object)));
 }
 
-void Sigmodr::Tree::StoreGroupModel::deleteObject(BaseModel* model)
+void StoreGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/StoreModel.cpp b/sigmodr/tree/StoreModel.cpp
index b0053a34..51c5ad2b 100644
--- a/sigmodr/tree/StoreModel.cpp
+++ b/sigmodr/tree/StoreModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::StoreModel::StoreModel(BaseModel* parent, Sigmod::Store* store) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+StoreModel::StoreModel(BaseModel* parent, Sigmod::Store* store) :
         ObjectModel(parent, store)
 {
 }
 
-QVariant Sigmodr::Tree::StoreModel::data(int role) const
+QVariant StoreModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Store*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::StoreModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::StoreModel::deleteSelf()
+void StoreModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/TileGroupModel.cpp b/sigmodr/tree/TileGroupModel.cpp
index 64c618b7..b7c1c9ba 100644
--- a/sigmodr/tree/TileGroupModel.cpp
+++ b/sigmodr/tree/TileGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TileGroupModel::TileGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+TileGroupModel::TileGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Tiles")
 {
     for (int i = 0; i < game->tileCount(); ++i)
         addObject(game->tile(i));
 }
 
-QVariant Sigmodr::Tree::TileGroupModel::data(const int role) const
+QVariant TileGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::TileGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::TileGroupModel::setData(const QVariant& value, int role)
+bool TileGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::TileGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::TileGroupModel::types() const
+QString TileGroupModel::types() const
 {
     return "Tile";
 }
 
-void Sigmodr::Tree::TileGroupModel::addObject(Sigmod::Object* object)
+void TileGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newTile();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::TileGroupModel::addObject(Sigmod::Object* object)
         addChild(new TileModel(this, qobject_cast<Sigmod::Tile*>(object)));
 }
 
-void Sigmodr::Tree::TileGroupModel::deleteObject(BaseModel* model)
+void TileGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/TileModel.cpp b/sigmodr/tree/TileModel.cpp
index 812509f0..f9817e56 100644
--- a/sigmodr/tree/TileModel.cpp
+++ b/sigmodr/tree/TileModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TileModel::TileModel(BaseModel* parent, Sigmod::Tile* tile) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+TileModel::TileModel(BaseModel* parent, Sigmod::Tile* tile) :
         ObjectModel(parent, tile)
 {
 }
 
-QVariant Sigmodr::Tree::TileModel::data(int role) const
+QVariant TileModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Tile*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::TileModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::TileModel::deleteSelf()
+void TileModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/TimeGroupModel.cpp b/sigmodr/tree/TimeGroupModel.cpp
index b1e10c86..d07ebf93 100644
--- a/sigmodr/tree/TimeGroupModel.cpp
+++ b/sigmodr/tree/TimeGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TimeGroupModel::TimeGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+TimeGroupModel::TimeGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Times")
 {
     for (int i = 0; i < game->timeCount(); ++i)
         addObject(game->time(i));
 }
 
-QVariant Sigmodr::Tree::TimeGroupModel::data(const int role) const
+QVariant TimeGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::TimeGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::TimeGroupModel::setData(const QVariant& value, int role)
+bool TimeGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::TimeGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::TimeGroupModel::types() const
+QString TimeGroupModel::types() const
 {
     return "Time";
 }
 
-void Sigmodr::Tree::TimeGroupModel::addObject(Sigmod::Object* object)
+void TimeGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newTime();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::TimeGroupModel::addObject(Sigmod::Object* object)
         addChild(new TimeModel(this, qobject_cast<Sigmod::Time*>(object)));
 }
 
-void Sigmodr::Tree::TimeGroupModel::deleteObject(BaseModel* model)
+void TimeGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/TimeModel.cpp b/sigmodr/tree/TimeModel.cpp
index b426d422..b6eea640 100644
--- a/sigmodr/tree/TimeModel.cpp
+++ b/sigmodr/tree/TimeModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TimeModel::TimeModel(BaseModel* parent, Sigmod::Time* time) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+TimeModel::TimeModel(BaseModel* parent, Sigmod::Time* time) :
         ObjectModel(parent, time)
 {
 }
 
-QVariant Sigmodr::Tree::TimeModel::data(int role) const
+QVariant TimeModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Time*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::TimeModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::TimeModel::deleteSelf()
+void TimeModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/TrainerGroupModel.cpp b/sigmodr/tree/TrainerGroupModel.cpp
index 1799a8eb..b4f3fa0a 100644
--- a/sigmodr/tree/TrainerGroupModel.cpp
+++ b/sigmodr/tree/TrainerGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TrainerGroupModel::TrainerGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+TrainerGroupModel::TrainerGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Trainers")
 {
     for (int i = 0; i < game->trainerCount(); ++i)
         addObject(game->trainer(i));
 }
 
-QVariant Sigmodr::Tree::TrainerGroupModel::data(const int role) const
+QVariant TrainerGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::TrainerGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::TrainerGroupModel::setData(const QVariant& value, int role)
+bool TrainerGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::TrainerGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::TrainerGroupModel::types() const
+QString TrainerGroupModel::types() const
 {
     return "Trainer";
 }
 
-void Sigmodr::Tree::TrainerGroupModel::addObject(Sigmod::Object* object)
+void TrainerGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newTrainer();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::TrainerGroupModel::addObject(Sigmod::Object* object)
         addChild(new TrainerModel(this, qobject_cast<Sigmod::Trainer*>(object)));
 }
 
-void Sigmodr::Tree::TrainerGroupModel::deleteObject(BaseModel* model)
+void TrainerGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/TrainerModel.cpp b/sigmodr/tree/TrainerModel.cpp
index 880df334..dd5059ac 100644
--- a/sigmodr/tree/TrainerModel.cpp
+++ b/sigmodr/tree/TrainerModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TrainerModel::TrainerModel(BaseModel* parent, Sigmod::Trainer* trainer) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+TrainerModel::TrainerModel(BaseModel* parent, Sigmod::Trainer* trainer) :
         ObjectModel(parent, trainer)
 {
 }
 
-QVariant Sigmodr::Tree::TrainerModel::data(int role) const
+QVariant TrainerModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Trainer*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::TrainerModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::TrainerModel::deleteSelf()
+void TrainerModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/TypeGroupModel.cpp b/sigmodr/tree/TypeGroupModel.cpp
index ca3f3c59..4493cca3 100644
--- a/sigmodr/tree/TypeGroupModel.cpp
+++ b/sigmodr/tree/TypeGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TypeGroupModel::TypeGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+TypeGroupModel::TypeGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Types")
 {
     for (int i = 0; i < game->typeCount(); ++i)
         addObject(game->type(i));
 }
 
-QVariant Sigmodr::Tree::TypeGroupModel::data(const int role) const
+QVariant TypeGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::TypeGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::TypeGroupModel::setData(const QVariant& value, int role)
+bool TypeGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::TypeGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::TypeGroupModel::types() const
+QString TypeGroupModel::types() const
 {
     return "Type";
 }
 
-void Sigmodr::Tree::TypeGroupModel::addObject(Sigmod::Object* object)
+void TypeGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newType();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::TypeGroupModel::addObject(Sigmod::Object* object)
         addChild(new TypeModel(this, qobject_cast<Sigmod::Type*>(object)));
 }
 
-void Sigmodr::Tree::TypeGroupModel::deleteObject(BaseModel* model)
+void TypeGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/TypeModel.cpp b/sigmodr/tree/TypeModel.cpp
index 4b9850a1..314b3444 100644
--- a/sigmodr/tree/TypeModel.cpp
+++ b/sigmodr/tree/TypeModel.cpp
@@ -31,12 +31,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::TypeModel::TypeModel(BaseModel* parent, Sigmod::Type* type) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+TypeModel::TypeModel(BaseModel* parent, Sigmod::Type* type) :
         ObjectModel(parent, type)
 {
 }
 
-QVariant Sigmodr::Tree::TypeModel::data(int role) const
+QVariant TypeModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Type*>(m_object)->name();
@@ -60,7 +63,7 @@ QVariant Sigmodr::Tree::TypeModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::TypeModel::deleteSelf()
+void TypeModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
diff --git a/sigmodr/tree/WeatherGroupModel.cpp b/sigmodr/tree/WeatherGroupModel.cpp
index 73929be6..0cf0bc94 100644
--- a/sigmodr/tree/WeatherGroupModel.cpp
+++ b/sigmodr/tree/WeatherGroupModel.cpp
@@ -28,14 +28,16 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::WeatherGroupModel::WeatherGroupModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Tree;
+
+WeatherGroupModel::WeatherGroupModel(BaseModel* parent, Sigmod::Game* game) :
         GroupModel(parent, game, "Weathers")
 {
     for (int i = 0; i < game->weatherCount(); ++i)
         addObject(game->weather(i));
 }
 
-QVariant Sigmodr::Tree::WeatherGroupModel::data(const int role) const
+QVariant WeatherGroupModel::data(const int role) const
 {
     if (role == BaseModel::ContextMenuRole)
     {
@@ -46,7 +48,7 @@ QVariant Sigmodr::Tree::WeatherGroupModel::data(const int role) const
     return GroupModel::data(role);
 }
 
-bool Sigmodr::Tree::WeatherGroupModel::setData(const QVariant& value, int role)
+bool WeatherGroupModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -64,12 +66,12 @@ bool Sigmodr::Tree::WeatherGroupModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::WeatherGroupModel::types() const
+QString WeatherGroupModel::types() const
 {
     return "Weather";
 }
 
-void Sigmodr::Tree::WeatherGroupModel::addObject(Sigmod::Object* object)
+void WeatherGroupModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::Game*>(m_object)->newWeather();
@@ -77,7 +79,7 @@ void Sigmodr::Tree::WeatherGroupModel::addObject(Sigmod::Object* object)
         addChild(new WeatherModel(this, qobject_cast<Sigmod::Weather*>(object)));
 }
 
-void Sigmodr::Tree::WeatherGroupModel::deleteObject(BaseModel* model)
+void WeatherGroupModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
diff --git a/sigmodr/tree/WeatherModel.cpp b/sigmodr/tree/WeatherModel.cpp
index a482da3d..383c31f6 100644
--- a/sigmodr/tree/WeatherModel.cpp
+++ b/sigmodr/tree/WeatherModel.cpp
@@ -30,12 +30,15 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::WeatherModel::WeatherModel(BaseModel* parent, Sigmod::Weather* weather) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+WeatherModel::WeatherModel(BaseModel* parent, Sigmod::Weather* weather) :
         ObjectModel(parent, weather)
 {
 }
 
-QVariant Sigmodr::Tree::WeatherModel::data(int role) const
+QVariant WeatherModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Weather*>(m_object)->name();
@@ -59,7 +62,7 @@ QVariant Sigmodr::Tree::WeatherModel::data(int role) const
     return ObjectModel::data(role);
 }
 
-void Sigmodr::Tree::WeatherModel::deleteSelf()
+void WeatherModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }