Moved the sources into the Widgets namespace

37 files changed, 429 insertions, 429 deletions

diff --git a/sigmodr/widgets/AbilityUI.cpp b/sigmodr/widgets/AbilityUI.cpp
index 97aadbc1..d7fb5ccd 100644
--- a/sigmodr/widgets/AbilityUI.cpp
+++ b/sigmodr/widgets/AbilityUI.cpp
@@ -21,18 +21,18 @@
 // Sigmod includes
 #include <sigmod/Ability.h>
 
-Sigmodr::AbilityUI::AbilityUI(Sigmod::Ability* ability, QWidget* parent) :
+Sigmodr::Widgets::AbilityUI::AbilityUI(Sigmod::Ability* ability, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(ability, new Sigmod::Ability(*ability));
 }
 
-Sigmodr::AbilityUI::~AbilityUI()
+Sigmodr::Widgets::AbilityUI::~AbilityUI()
 {
 }
 
-void Sigmodr::AbilityUI::setGui()
+void Sigmodr::Widgets::AbilityUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Ability*>(modified())->name());
     varPriority->setValue(qobject_cast<Sigmod::Ability*>(modified())->priority());
@@ -42,47 +42,47 @@ void Sigmodr::AbilityUI::setGui()
     varPriorityScript->setValue(qobject_cast<Sigmod::Ability*>(modified())->priorityScript());
 }
 
-void Sigmodr::AbilityUI::apply()
+void Sigmodr::Widgets::AbilityUI::apply()
 {
     *qobject_cast<Sigmod::Ability*>(original()) = *qobject_cast<Sigmod::Ability*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::AbilityUI::discard()
+void Sigmodr::Widgets::AbilityUI::discard()
 {
     *qobject_cast<Sigmod::Ability*>(modified()) = *qobject_cast<Sigmod::Ability*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::AbilityUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::AbilityUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Ability*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::AbilityUI::on_varPriority_valueChanged(const int priority)
+void Sigmodr::Widgets::AbilityUI::on_varPriority_valueChanged(const int priority)
 {
     qobject_cast<Sigmod::Ability*>(modified())->setPriority(priority);
 }
 
-void Sigmodr::AbilityUI::on_varDescription_textChanged(const QString& description)
+void Sigmodr::Widgets::AbilityUI::on_varDescription_textChanged(const QString& description)
 {
     qobject_cast<Sigmod::Ability*>(modified())->setDescription(description);
 }
 
-void Sigmodr::AbilityUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
+void Sigmodr::Widgets::AbilityUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
 {
     qobject_cast<Sigmod::Ability*>(modified())->setBattleScript(battleScript);
 }
 
-void Sigmodr::AbilityUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
+void Sigmodr::Widgets::AbilityUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
 {
     qobject_cast<Sigmod::Ability*>(modified())->setWorldScript(worldScript);
 }
 
-void Sigmodr::AbilityUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript)
+void Sigmodr::Widgets::AbilityUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript)
 {
     qobject_cast<Sigmod::Ability*>(modified())->setPriorityScript(priorityScript);
 }
diff --git a/sigmodr/widgets/AuthorUI.cpp b/sigmodr/widgets/AuthorUI.cpp
index 02633c1f..0cad47bd 100644
--- a/sigmodr/widgets/AuthorUI.cpp
+++ b/sigmodr/widgets/AuthorUI.cpp
@@ -21,52 +21,52 @@
 // Sigmod includes
 #include <sigmod/Author.h>
 
-Sigmodr::AuthorUI::AuthorUI(Sigmod::Author* author, QWidget* parent) :
+Sigmodr::Widgets::AuthorUI::AuthorUI(Sigmod::Author* author, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(author, new Sigmod::Author(*author));
 }
 
-Sigmodr::AuthorUI::~AuthorUI()
+Sigmodr::Widgets::AuthorUI::~AuthorUI()
 {
 }
 
-void Sigmodr::AuthorUI::setGui()
+void Sigmodr::Widgets::AuthorUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Author*>(modified())->name());
     varEmail->setText(qobject_cast<Sigmod::Author*>(modified())->email());
     varRole->setText(qobject_cast<Sigmod::Author*>(modified())->role());
 }
 
-void Sigmodr::AuthorUI::apply()
+void Sigmodr::Widgets::AuthorUI::apply()
 {
     *qobject_cast<Sigmod::Author*>(original()) = *qobject_cast<Sigmod::Author*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::AuthorUI::discard()
+void Sigmodr::Widgets::AuthorUI::discard()
 {
     *qobject_cast<Sigmod::Author*>(modified()) = *qobject_cast<Sigmod::Author*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::AuthorUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::AuthorUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Author*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::AuthorUI::on_varEmail_textChanged(const QString& email)
+void Sigmodr::Widgets::AuthorUI::on_varEmail_textChanged(const QString& email)
 {
     const int cursor = varEmail->cursorPosition();
     qobject_cast<Sigmod::Author*>(modified())->setEmail(email);
     varEmail->setCursorPosition(cursor);
 }
 
-void Sigmodr::AuthorUI::on_varRole_textChanged(const QString& role)
+void Sigmodr::Widgets::AuthorUI::on_varRole_textChanged(const QString& role)
 {
     const int cursor = varRole->cursorPosition();
     qobject_cast<Sigmod::Author*>(modified())->setRole(role);
diff --git a/sigmodr/widgets/BadgeUI.cpp b/sigmodr/widgets/BadgeUI.cpp
index 2a526c72..50ad7458 100644
--- a/sigmodr/widgets/BadgeUI.cpp
+++ b/sigmodr/widgets/BadgeUI.cpp
@@ -27,23 +27,23 @@
 // Qt includes
 #include <QtGui/QHeaderView>
 
-Sigmodr::BadgeUI::BadgeUI(Sigmod::Badge* badge, QWidget* parent) :
+Sigmodr::Widgets::BadgeUI::BadgeUI(Sigmod::Badge* badge, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(badge, new Sigmod::Badge(*badge));
 }
 
-Sigmodr::BadgeUI::~BadgeUI()
+Sigmodr::Widgets::BadgeUI::~BadgeUI()
 {
 }
 
-void Sigmodr::BadgeUI::initGui()
+void Sigmodr::Widgets::BadgeUI::initGui()
 {
     varStat->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
 }
 
-void Sigmodr::BadgeUI::refreshGui()
+void Sigmodr::Widgets::BadgeUI::refreshGui()
 {
     int maxHeight = 0;
     int maxWidth = 0;
@@ -110,7 +110,7 @@ void Sigmodr::BadgeUI::refreshGui()
     }
 }
 
-void Sigmodr::BadgeUI::setGui()
+void Sigmodr::Widgets::BadgeUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Badge*>(modified())->name());
     varObey->setValue(qobject_cast<Sigmod::Badge*>(modified())->obey());
@@ -129,47 +129,47 @@ void Sigmodr::BadgeUI::setGui()
     varStatMultiplier->setValue(qobject_cast<Sigmod::Badge*>(modified())->stat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>()));
 }
 
-void Sigmodr::BadgeUI::apply()
+void Sigmodr::Widgets::BadgeUI::apply()
 {
     *qobject_cast<Sigmod::Badge*>(original()) = *qobject_cast<Sigmod::Badge*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::BadgeUI::discard()
+void Sigmodr::Widgets::BadgeUI::discard()
 {
     *qobject_cast<Sigmod::Badge*>(modified()) = *qobject_cast<Sigmod::Badge*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::BadgeUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::BadgeUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Badge*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::BadgeUI::on_varObey_valueChanged(const int obey)
+void Sigmodr::Widgets::BadgeUI::on_varObey_valueChanged(const int obey)
 {
     qobject_cast<Sigmod::Badge*>(modified())->setObey(obey);
 }
 
-void Sigmodr::BadgeUI::on_varFace_currentIndexChanged(const int face)
+void Sigmodr::Widgets::BadgeUI::on_varFace_currentIndexChanged(const int face)
 {
     qobject_cast<Sigmod::Badge*>(modified())->setFace(varFace->itemData(face).toInt());
 }
 
-void Sigmodr::BadgeUI::on_varBadge_currentIndexChanged(const int badge)
+void Sigmodr::Widgets::BadgeUI::on_varBadge_currentIndexChanged(const int badge)
 {
     qobject_cast<Sigmod::Badge*>(modified())->setBadge(varFace->itemData(badge).toInt());
 }
 
-void Sigmodr::BadgeUI::on_varStat_currentCellChanged(const int row)
+void Sigmodr::Widgets::BadgeUI::on_varStat_currentCellChanged(const int row)
 {
     varStatMultiplier->setValue(qobject_cast<Sigmod::Badge*>(modified())->stat(varStat->verticalHeaderItem(row)->data(Qt::UserRole).value<Sigmod::Stat>()));
 }
 
-void Sigmodr::BadgeUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier)
+void Sigmodr::Widgets::BadgeUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier)
 {
     qobject_cast<Sigmod::Badge*>(modified())->setStat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>(), multiplier);
 }
diff --git a/sigmodr/widgets/CoinListItemUI.cpp b/sigmodr/widgets/CoinListItemUI.cpp
index 2679e7d1..bda7f62c 100644
--- a/sigmodr/widgets/CoinListItemUI.cpp
+++ b/sigmodr/widgets/CoinListItemUI.cpp
@@ -27,7 +27,7 @@
 // Qt includes
 #include <QtGui/QButtonGroup>
 
-Sigmodr::CoinListItemUI::CoinListItemUI(Sigmod::CoinListItem* item, QWidget* parent) :
+Sigmodr::Widgets::CoinListItemUI::CoinListItemUI(Sigmod::CoinListItem* item, QWidget* parent) :
         ObjectUI(parent),
         m_buttonGroup(new QButtonGroup(this)),
         m_lastType(-1)
@@ -36,11 +36,11 @@ Sigmodr::CoinListItemUI::CoinListItemUI(Sigmod::CoinListItem* item, QWidget* par
     setObjects(item, new Sigmod::CoinListItem(*item));
 }
 
-Sigmodr::CoinListItemUI::~CoinListItemUI()
+Sigmodr::Widgets::CoinListItemUI::~CoinListItemUI()
 {
 }
 
-void Sigmodr::CoinListItemUI::initGui()
+void Sigmodr::Widgets::CoinListItemUI::initGui()
 {
     setTabOrder(varItem, varSpecies);
     setTabOrder(varSpecies, varObject);
@@ -50,7 +50,7 @@ void Sigmodr::CoinListItemUI::initGui()
     connect(m_buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(typeChanged(int)));
 }
 
-void Sigmodr::CoinListItemUI::setGui()
+void Sigmodr::Widgets::CoinListItemUI::setGui()
 {
     bool resetObjects = (qobject_cast<Sigmod::CoinListItem*>(modified())->type() != m_lastType);
     m_buttonGroup->button(qobject_cast<Sigmod::CoinListItem*>(modified())->type())->setChecked(true);
@@ -81,30 +81,30 @@ void Sigmodr::CoinListItemUI::setGui()
     varCost->setValue(qobject_cast<Sigmod::CoinListItem*>(modified())->cost());
 }
 
-void Sigmodr::CoinListItemUI::apply()
+void Sigmodr::Widgets::CoinListItemUI::apply()
 {
     *qobject_cast<Sigmod::CoinListItem*>(original()) = *qobject_cast<Sigmod::CoinListItem*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::CoinListItemUI::discard()
+void Sigmodr::Widgets::CoinListItemUI::discard()
 {
     *qobject_cast<Sigmod::CoinListItem*>(modified()) = *qobject_cast<Sigmod::CoinListItem*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::CoinListItemUI::typeChanged(const int type)
+void Sigmodr::Widgets::CoinListItemUI::typeChanged(const int type)
 {
     qobject_cast<Sigmod::CoinListItem*>(modified())->setType(Sigmod::CoinListItem::Type(type));
 }
 
-void Sigmodr::CoinListItemUI::on_varObject_activated(const int obey)
+void Sigmodr::Widgets::CoinListItemUI::on_varObject_activated(const int obey)
 {
     qobject_cast<Sigmod::CoinListItem*>(modified())->setObject(varObject->itemData(obey).toInt());
 }
 
-void Sigmodr::CoinListItemUI::on_varCost_valueChanged(const int cost)
+void Sigmodr::Widgets::CoinListItemUI::on_varCost_valueChanged(const int cost)
 {
     qobject_cast<Sigmod::CoinListItem*>(modified())->setCost(cost);
 }
diff --git a/sigmodr/widgets/CoinListUI.cpp b/sigmodr/widgets/CoinListUI.cpp
index 102a70ed..e35cce5e 100644
--- a/sigmodr/widgets/CoinListUI.cpp
+++ b/sigmodr/widgets/CoinListUI.cpp
@@ -22,44 +22,44 @@
 #include <sigmod/CoinList.h>
 #include <sigmod/Sigmod.h>
 
-Sigmodr::CoinListUI::CoinListUI(Sigmod::CoinList* coinList, QWidget* parent) :
+Sigmodr::Widgets::CoinListUI::CoinListUI(Sigmod::CoinList* coinList, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(coinList, new Sigmod::CoinList(*coinList));
 }
 
-Sigmodr::CoinListUI::~CoinListUI()
+Sigmodr::Widgets::CoinListUI::~CoinListUI()
 {
 }
 
-void Sigmodr::CoinListUI::setGui()
+void Sigmodr::Widgets::CoinListUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::CoinList*>(modified())->name());
     varScript->setValue(qobject_cast<Sigmod::CoinList*>(modified())->script());
 }
 
-void Sigmodr::CoinListUI::apply()
+void Sigmodr::Widgets::CoinListUI::apply()
 {
     *qobject_cast<Sigmod::CoinList*>(original()) = *qobject_cast<Sigmod::CoinList*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::CoinListUI::discard()
+void Sigmodr::Widgets::CoinListUI::discard()
 {
     *qobject_cast<Sigmod::CoinList*>(modified()) = *qobject_cast<Sigmod::CoinList*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::CoinListUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::CoinListUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::CoinList*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::CoinListUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::CoinListUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::CoinList*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/EggGroupUI.cpp b/sigmodr/widgets/EggGroupUI.cpp
index 6919b8ff..51e98115 100644
--- a/sigmodr/widgets/EggGroupUI.cpp
+++ b/sigmodr/widgets/EggGroupUI.cpp
@@ -21,36 +21,36 @@
 // Sigmod includes
 #include <sigmod/EggGroup.h>
 
-Sigmodr::EggGroupUI::EggGroupUI(Sigmod::EggGroup* eggGroup, QWidget* parent) :
+Sigmodr::Widgets::EggGroupUI::EggGroupUI(Sigmod::EggGroup* eggGroup, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(eggGroup, new Sigmod::EggGroup(*eggGroup));
 }
 
-Sigmodr::EggGroupUI::~EggGroupUI()
+Sigmodr::Widgets::EggGroupUI::~EggGroupUI()
 {
 }
 
-void Sigmodr::EggGroupUI::setGui()
+void Sigmodr::Widgets::EggGroupUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::EggGroup*>(modified())->name());
 }
 
-void Sigmodr::EggGroupUI::apply()
+void Sigmodr::Widgets::EggGroupUI::apply()
 {
     *qobject_cast<Sigmod::EggGroup*>(original()) = *qobject_cast<Sigmod::EggGroup*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::EggGroupUI::discard()
+void Sigmodr::Widgets::EggGroupUI::discard()
 {
     *qobject_cast<Sigmod::EggGroup*>(modified()) = *qobject_cast<Sigmod::EggGroup*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::EggGroupUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::EggGroupUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::EggGroup*>(modified())->setName(name);
diff --git a/sigmodr/widgets/FractionWidget.cpp b/sigmodr/widgets/FractionWidget.cpp
index a688b8e2..87893a99 100644
--- a/sigmodr/widgets/FractionWidget.cpp
+++ b/sigmodr/widgets/FractionWidget.cpp
@@ -18,7 +18,7 @@
 // Header include
 #include "FractionWidget.h"
 
-Sigmodr::FractionWidget::FractionWidget(QWidget* parent, const Sigcore::Fraction& value) :
+Sigmodr::Widgets::FractionWidget::FractionWidget(QWidget* parent, const Sigcore::Fraction& value) :
         QWidget(parent),
         m_behavior(Any),
         m_value(value)
@@ -30,23 +30,23 @@ Sigmodr::FractionWidget::FractionWidget(QWidget* parent, const Sigcore::Fraction
     resetRanges();
 }
 
-Sigmodr::FractionWidget::Behavior Sigmodr::FractionWidget::behavior() const
+Sigmodr::Widgets::FractionWidget::Behavior Sigmodr::Widgets::FractionWidget::behavior() const
 {
     return m_behavior;
 }
 
-Sigcore::Fraction Sigmodr::FractionWidget::value() const
+Sigcore::Fraction Sigmodr::Widgets::FractionWidget::value() const
 {
     return m_value;
 }
 
-void Sigmodr::FractionWidget::setBehavior(const Behavior behavior)
+void Sigmodr::Widgets::FractionWidget::setBehavior(const Behavior behavior)
 {
     m_behavior = behavior;
     emit(behaviorChanged(m_behavior));
 }
 
-void Sigmodr::FractionWidget::setValue(const Sigcore::Fraction& value)
+void Sigmodr::Widgets::FractionWidget::setValue(const Sigcore::Fraction& value)
 {
     if (!varValue->text().isEmpty() && (m_value == value))
         return;
@@ -54,24 +54,24 @@ void Sigmodr::FractionWidget::setValue(const Sigcore::Fraction& value)
     emit(valueChanged(m_value));
 }
 
-void Sigmodr::FractionWidget::updateValue()
+void Sigmodr::Widgets::FractionWidget::updateValue()
 {
     varValue->setText(QString::number(double(m_value), 'g', 7));
 }
 
-void Sigmodr::FractionWidget::on_varNumerator_valueChanged(const int numerator)
+void Sigmodr::Widgets::FractionWidget::on_varNumerator_valueChanged(const int numerator)
 {
     m_value.setNumerator(numerator);
     emit(valueChanged(m_value));
 }
 
-void Sigmodr::FractionWidget::on_varDenominator_valueChanged(const int denominator)
+void Sigmodr::Widgets::FractionWidget::on_varDenominator_valueChanged(const int denominator)
 {
     m_value.setDenominator(denominator);
     emit(valueChanged(m_value));
 }
 
-void Sigmodr::FractionWidget::resetRanges()
+void Sigmodr::Widgets::FractionWidget::resetRanges()
 {
     varNumerator->setValue(m_value.numerator());
     varDenominator->setValue(m_value.denominator());
diff --git a/sigmodr/widgets/GlobalScriptUI.cpp b/sigmodr/widgets/GlobalScriptUI.cpp
index 94d725e2..af06dc0c 100644
--- a/sigmodr/widgets/GlobalScriptUI.cpp
+++ b/sigmodr/widgets/GlobalScriptUI.cpp
@@ -21,44 +21,44 @@
 // Sigmod includes
 #include <sigmod/GlobalScript.h>
 
-Sigmodr::GlobalScriptUI::GlobalScriptUI(Sigmod::GlobalScript* globalScript, QWidget* parent) :
+Sigmodr::Widgets::GlobalScriptUI::GlobalScriptUI(Sigmod::GlobalScript* globalScript, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(globalScript, new Sigmod::GlobalScript(*globalScript));
 }
 
-Sigmodr::GlobalScriptUI::~GlobalScriptUI()
+Sigmodr::Widgets::GlobalScriptUI::~GlobalScriptUI()
 {
 }
 
-void Sigmodr::GlobalScriptUI::setGui()
+void Sigmodr::Widgets::GlobalScriptUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::GlobalScript*>(modified())->name());
     varScript->setValue(qobject_cast<Sigmod::GlobalScript*>(modified())->script());
 }
 
-void Sigmodr::GlobalScriptUI::apply()
+void Sigmodr::Widgets::GlobalScriptUI::apply()
 {
     *qobject_cast<Sigmod::GlobalScript*>(original()) = *qobject_cast<Sigmod::GlobalScript*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::GlobalScriptUI::discard()
+void Sigmodr::Widgets::GlobalScriptUI::discard()
 {
     *qobject_cast<Sigmod::GlobalScript*>(modified()) = *qobject_cast<Sigmod::GlobalScript*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::GlobalScriptUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::GlobalScriptUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::GlobalScript*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::GlobalScriptUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::GlobalScriptUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::GlobalScript*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/ItemTypeUI.cpp b/sigmodr/widgets/ItemTypeUI.cpp
index 22e23245..5409fa7f 100644
--- a/sigmodr/widgets/ItemTypeUI.cpp
+++ b/sigmodr/widgets/ItemTypeUI.cpp
@@ -23,25 +23,25 @@
 #include <sigmod/Rules.h>
 #include <sigmod/Sigmod.h>
 
-Sigmodr::ItemTypeUI::ItemTypeUI(Sigmod::ItemType* itemType, QWidget* parent) :
+Sigmodr::Widgets::ItemTypeUI::ItemTypeUI(Sigmod::ItemType* itemType, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(itemType, new Sigmod::ItemType(*itemType));
 }
 
-Sigmodr::ItemTypeUI::~ItemTypeUI()
+Sigmodr::Widgets::ItemTypeUI::~ItemTypeUI()
 {
 }
 
-void Sigmodr::ItemTypeUI::initGui()
+void Sigmodr::Widgets::ItemTypeUI::initGui()
 {
     varCount->addItem(Sigmod::ItemType::CountStr[Sigmod::ItemType::Distinct], QVariant::fromValue(Sigmod::ItemType::Distinct));
     varCount->addItem(Sigmod::ItemType::CountStr[Sigmod::ItemType::Total], QVariant::fromValue(Sigmod::ItemType::Total));
     varMaxWeight->setMaximum(sigmod()->rules()->maxTotalWeight());
 }
 
-void Sigmodr::ItemTypeUI::setGui()
+void Sigmodr::Widgets::ItemTypeUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::ItemType*>(modified())->name());
     varComputer->setValue(qobject_cast<Sigmod::ItemType*>(modified())->computer());
@@ -50,42 +50,42 @@ void Sigmodr::ItemTypeUI::setGui()
     varCount->setCurrentIndex(qobject_cast<Sigmod::ItemType*>(modified())->count());
 }
 
-void Sigmodr::ItemTypeUI::apply()
+void Sigmodr::Widgets::ItemTypeUI::apply()
 {
     *qobject_cast<Sigmod::ItemType*>(original()) = *qobject_cast<Sigmod::ItemType*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::ItemTypeUI::discard()
+void Sigmodr::Widgets::ItemTypeUI::discard()
 {
     *qobject_cast<Sigmod::ItemType*>(modified()) = *qobject_cast<Sigmod::ItemType*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::ItemTypeUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::ItemTypeUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::ItemType*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::ItemTypeUI::on_varComputer_valueChanged(const int computer)
+void Sigmodr::Widgets::ItemTypeUI::on_varComputer_valueChanged(const int computer)
 {
     qobject_cast<Sigmod::ItemType*>(modified())->setComputer(computer);
 }
 
-void Sigmodr::ItemTypeUI::on_varPlayer_valueChanged(const int player)
+void Sigmodr::Widgets::ItemTypeUI::on_varPlayer_valueChanged(const int player)
 {
     qobject_cast<Sigmod::ItemType*>(modified())->setPlayer(player);
 }
 
-void Sigmodr::ItemTypeUI::on_varMaxWeight_valueChanged(const int maxWeight)
+void Sigmodr::Widgets::ItemTypeUI::on_varMaxWeight_valueChanged(const int maxWeight)
 {
     qobject_cast<Sigmod::ItemType*>(modified())->setMaxWeight(maxWeight);
 }
 
-void Sigmodr::ItemTypeUI::on_varCount_currentIndexChanged(const int count)
+void Sigmodr::Widgets::ItemTypeUI::on_varCount_currentIndexChanged(const int count)
 {
     qobject_cast<Sigmod::ItemType*>(modified())->setCount(varCount->itemData(count).value<Sigmod::ItemType::Count>());
 }
diff --git a/sigmodr/widgets/ItemUI.cpp b/sigmodr/widgets/ItemUI.cpp
index 45c42e96..3ef2ba11 100644
--- a/sigmodr/widgets/ItemUI.cpp
+++ b/sigmodr/widgets/ItemUI.cpp
@@ -24,7 +24,7 @@
 #include <sigmod/Rules.h>
 #include <sigmod/Sigmod.h>
 
-Sigmodr::ItemUI::ItemUI(Sigmod::Item* item, QWidget* parent) :
+Sigmodr::Widgets::ItemUI::ItemUI(Sigmod::Item* item, QWidget* parent) :
         ObjectUI(parent),
         m_lastType(-1)
 {
@@ -32,11 +32,11 @@ Sigmodr::ItemUI::ItemUI(Sigmod::Item* item, QWidget* parent) :
     setObjects(item, new Sigmod::Item(*item));
 }
 
-Sigmodr::ItemUI::~ItemUI()
+Sigmodr::Widgets::ItemUI::~ItemUI()
 {
 }
 
-void Sigmodr::ItemUI::refreshGui()
+void Sigmodr::Widgets::ItemUI::refreshGui()
 {
     const bool blocked = varType->blockSignals(true);
     varType->clear();
@@ -49,7 +49,7 @@ void Sigmodr::ItemUI::refreshGui()
     varPrice->setMaximum(sigmod()->rules()->maxMoney());
 }
 
-void Sigmodr::ItemUI::setGui()
+void Sigmodr::Widgets::ItemUI::setGui()
 {
     const bool resetWeight = (qobject_cast<Sigmod::Item*>(modified())->type() != m_lastType);
     varName->setText(qobject_cast<Sigmod::Item*>(modified())->name());
@@ -70,57 +70,57 @@ void Sigmodr::ItemUI::setGui()
     varScript->setValue(qobject_cast<Sigmod::Item*>(modified())->script());
 }
 
-void Sigmodr::ItemUI::apply()
+void Sigmodr::Widgets::ItemUI::apply()
 {
     *qobject_cast<Sigmod::Item*>(original()) = *qobject_cast<Sigmod::Item*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::ItemUI::discard()
+void Sigmodr::Widgets::ItemUI::discard()
 {
     *qobject_cast<Sigmod::Item*>(modified()) = *qobject_cast<Sigmod::Item*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::ItemUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::ItemUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Item*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::ItemUI::on_varSellable_toggled(const bool sellable)
+void Sigmodr::Widgets::ItemUI::on_varSellable_toggled(const bool sellable)
 {
     qobject_cast<Sigmod::Item*>(modified())->setSellable(sellable);
 }
 
-void Sigmodr::ItemUI::on_varType_activated(const int type)
+void Sigmodr::Widgets::ItemUI::on_varType_activated(const int type)
 {
     qobject_cast<Sigmod::Item*>(modified())->setType(varType->itemData(type).toInt());
 }
 
-void Sigmodr::ItemUI::on_varPrice_valueChanged(const int price)
+void Sigmodr::Widgets::ItemUI::on_varPrice_valueChanged(const int price)
 {
     qobject_cast<Sigmod::Item*>(modified())->setPrice(price);
 }
 
-void Sigmodr::ItemUI::on_varSellPrice_valueChanged(const int sellPrice)
+void Sigmodr::Widgets::ItemUI::on_varSellPrice_valueChanged(const int sellPrice)
 {
     qobject_cast<Sigmod::Item*>(modified())->setSellPrice(sellPrice);
 }
 
-void Sigmodr::ItemUI::on_varWeight_valueChanged(const int weight)
+void Sigmodr::Widgets::ItemUI::on_varWeight_valueChanged(const int weight)
 {
     qobject_cast<Sigmod::Item*>(modified())->setWeight(weight);
 }
 
-void Sigmodr::ItemUI::on_varDescription_textChanged(const QString& description)
+void Sigmodr::Widgets::ItemUI::on_varDescription_textChanged(const QString& description)
 {
     qobject_cast<Sigmod::Item*>(modified())->setDescription(description);
 }
 
-void Sigmodr::ItemUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::ItemUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::Item*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/MapEffectUI.cpp b/sigmodr/widgets/MapEffectUI.cpp
index 5cef134c..382885aa 100644
--- a/sigmodr/widgets/MapEffectUI.cpp
+++ b/sigmodr/widgets/MapEffectUI.cpp
@@ -24,18 +24,18 @@
 #include <sigmod/Sigmod.h>
 #include <sigmod/Skin.h>
 
-Sigmodr::MapEffectUI::MapEffectUI(Sigmod::MapEffect* effect, QWidget* parent) :
+Sigmodr::Widgets::MapEffectUI::MapEffectUI(Sigmod::MapEffect* effect, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(effect, new Sigmod::MapEffect(*effect));
 }
 
-Sigmodr::MapEffectUI::~MapEffectUI()
+Sigmodr::Widgets::MapEffectUI::~MapEffectUI()
 {
 }
 
-void Sigmodr::MapEffectUI::refreshGui()
+void Sigmodr::Widgets::MapEffectUI::refreshGui()
 {
     for (int i = 0; i < sigmod()->skinCount(); ++i)
     {
@@ -44,7 +44,7 @@ void Sigmodr::MapEffectUI::refreshGui()
     }
 }
 
-void Sigmodr::MapEffectUI::setGui()
+void Sigmodr::Widgets::MapEffectUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::MapEffect*>(modified())->name());
     varSkin->setCurrentIndex(varSkin->findData(qobject_cast<Sigmod::MapEffect*>(modified())->skin()));
@@ -52,37 +52,37 @@ void Sigmodr::MapEffectUI::setGui()
     varIsGhost->setCheckState(qobject_cast<Sigmod::MapEffect*>(modified())->isGhost() ? Qt::Checked : Qt::Unchecked);
 }
 
-void Sigmodr::MapEffectUI::apply()
+void Sigmodr::Widgets::MapEffectUI::apply()
 {
     *qobject_cast<Sigmod::MapEffect*>(original()) = *qobject_cast<Sigmod::MapEffect*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapEffectUI::discard()
+void Sigmodr::Widgets::MapEffectUI::discard()
 {
     *qobject_cast<Sigmod::MapEffect*>(modified()) = *qobject_cast<Sigmod::MapEffect*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapEffectUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::MapEffectUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::MapEffect*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::MapEffectUI::on_varSkin_currentIndexChanged(const int skin)
+void Sigmodr::Widgets::MapEffectUI::on_varSkin_currentIndexChanged(const int skin)
 {
     qobject_cast<Sigmod::MapEffect*>(modified())->setSkin(varSkin->itemData(skin).toInt());
 }
 
-void Sigmodr::MapEffectUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::MapEffectUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::MapEffect*>(modified())->setScript(script);
 }
 
-void Sigmodr::MapEffectUI::on_varIsGhost_toggled(const bool isGhost)
+void Sigmodr::Widgets::MapEffectUI::on_varIsGhost_toggled(const bool isGhost)
 {
     qobject_cast<Sigmod::MapEffect*>(modified())->setIsGhost(isGhost);
 }
diff --git a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
index 7e601968..65795744 100644
--- a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
+++ b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
@@ -31,23 +31,23 @@
 // Qt includes
 #include <QtGui/QListWidgetItem>
 
-Sigmodr::MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(Sigmod::MapTrainerTeamMember* teamMember, QWidget* parent) :
+Sigmodr::Widgets::MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(Sigmod::MapTrainerTeamMember* teamMember, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(teamMember, new Sigmod::MapTrainerTeamMember(*teamMember));
 }
 
-Sigmodr::MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI()
+Sigmodr::Widgets::MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI()
 {
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::initGui()
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::initGui()
 {
     connect(varItems->selectedListWidget(), SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(selectedItemChanged(QListWidgetItem*)));
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::refreshGui()
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
 {
     const bool blockedSpecies = varSpecies->blockSignals(true);
     varSpecies->clear();
@@ -107,7 +107,7 @@ void Sigmodr::MapTrainerTeamMemberUI::refreshGui()
     boxNatures->setEnabled(sigmod()->rules()->maxNatures());
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::setGui()
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::setGui()
 {
     varSpecies->setCurrentIndex(varSpecies->findData(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->species()));
     varLevel->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->level());
@@ -168,54 +168,54 @@ void Sigmodr::MapTrainerTeamMemberUI::setGui()
     varNatures->setButtonsEnabled();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::apply()
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::apply()
 {
     *qobject_cast<Sigmod::MapTrainerTeamMember*>(original()) = *qobject_cast<Sigmod::MapTrainerTeamMember*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::discard()
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::discard()
 {
     *qobject_cast<Sigmod::MapTrainerTeamMember*>(modified()) = *qobject_cast<Sigmod::MapTrainerTeamMember*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varSpecies_activated(const int species)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varSpecies_activated(const int species)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setSpecies(varSpecies->itemData(species).toInt());
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setLevel(level);
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varAbilities_added(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varAbilities_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varAbilities_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varAbilities_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varItems_added(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varItems_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 1);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varItems_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varItems_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 0);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
 {
     if (item)
         varItemCount->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(item->data(Qt::UserRole).toInt()));
@@ -223,32 +223,32 @@ void Sigmodr::MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
         varItemCount->setEnabled(false);
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varItemCount_valueChanged(const int itemCount)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varItemCount_valueChanged(const int itemCount)
 {
     QListWidgetItem* item = varItems->selectedListWidget()->currentItem();
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), itemCount);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varMoves_added(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varMoves_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varMoves_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varMoves_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varNatures_added(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varNatures_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varNatures_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varNatures_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), false);
     setGui();
diff --git a/sigmodr/widgets/MapTrainerUI.cpp b/sigmodr/widgets/MapTrainerUI.cpp
index 8acf170f..6741dc9b 100644
--- a/sigmodr/widgets/MapTrainerUI.cpp
+++ b/sigmodr/widgets/MapTrainerUI.cpp
@@ -30,18 +30,18 @@
 #include <QtGui/QListWidget>
 #include <QtGui/QListWidgetItem>
 
-Sigmodr::MapTrainerUI::MapTrainerUI(Sigmod::MapTrainer* trainer, QWidget* parent) :
+Sigmodr::Widgets::MapTrainerUI::MapTrainerUI(Sigmod::MapTrainer* trainer, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(trainer, new Sigmod::MapTrainer(*trainer));
 }
 
-Sigmodr::MapTrainerUI::~MapTrainerUI()
+Sigmodr::Widgets::MapTrainerUI::~MapTrainerUI()
 {
 }
 
-void Sigmodr::MapTrainerUI::refreshGui()
+void Sigmodr::Widgets::MapTrainerUI::refreshGui()
 {
     const bool blockedTrainerClass = varTrainerClass->blockSignals(true);
     varTrainerClass->clear();
@@ -68,7 +68,7 @@ void Sigmodr::MapTrainerUI::refreshGui()
     varLeadTeamMember->setButtonsEnabled();
 }
 
-void Sigmodr::MapTrainerUI::setGui()
+void Sigmodr::Widgets::MapTrainerUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::MapTrainer*>(modified())->name());
     varTrainerClass->setCurrentIndex(varTrainerClass->findData(qobject_cast<Sigmod::MapTrainer*>(modified())->trainerClass()));
@@ -89,48 +89,48 @@ void Sigmodr::MapTrainerUI::setGui()
     varLeadTeamMember->setButtonsEnabled();
 }
 
-void Sigmodr::MapTrainerUI::apply()
+void Sigmodr::Widgets::MapTrainerUI::apply()
 {
     *qobject_cast<Sigmod::MapTrainer*>(original()) = *qobject_cast<Sigmod::MapTrainer*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapTrainerUI::discard()
+void Sigmodr::Widgets::MapTrainerUI::discard()
 {
     *qobject_cast<Sigmod::MapTrainer*>(modified()) = *qobject_cast<Sigmod::MapTrainer*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapTrainerUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::MapTrainerUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::MapTrainer*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::MapTrainerUI::on_varTrainerClass_activated(const int trainerClass)
+void Sigmodr::Widgets::MapTrainerUI::on_varTrainerClass_activated(const int trainerClass)
 {
     qobject_cast<Sigmod::MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt());
 }
 
-void Sigmodr::MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight)
+void Sigmodr::Widgets::MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight)
 {
     qobject_cast<Sigmod::MapTrainer*>(modified())->setNumberFight(numberFight);
 }
 
-void Sigmodr::MapTrainerUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::MapTrainerUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::MapTrainer*>(modified())->setScript(script);
 }
 
-void Sigmodr::MapTrainerUI::on_varLeadTeamMember_added(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerUI::on_varLeadTeamMember_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::MapTrainerUI::on_varLeadTeamMember_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::MapTrainerUI::on_varLeadTeamMember_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), false);
     setGui();
diff --git a/sigmodr/widgets/MapUI.cpp b/sigmodr/widgets/MapUI.cpp
index 9e6386d6..80285969 100644
--- a/sigmodr/widgets/MapUI.cpp
+++ b/sigmodr/widgets/MapUI.cpp
@@ -27,7 +27,7 @@
 
 // FIXME: Update map editing to new collage map
 
-Sigmodr::MapUI::MapUI(Sigmod::Map* map, QWidget* parent) :
+Sigmodr::Widgets::MapUI::MapUI(Sigmod::Map* map, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
@@ -36,45 +36,45 @@ Sigmodr::MapUI::MapUI(Sigmod::Map* map, QWidget* parent) :
     connect(varMap, SIGNAL(changed()), this, SIGNAL(changed()));
 }
 
-Sigmodr::MapUI::~MapUI()
+Sigmodr::Widgets::MapUI::~MapUI()
 {
 }
 
-void Sigmodr::MapUI::initGui()
+void Sigmodr::Widgets::MapUI::initGui()
 {
     varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Outdoor], QVariant::fromValue(Sigmod::Map::Outdoor));
     varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Dungeon], QVariant::fromValue(Sigmod::Map::Dungeon));
     varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Building], QVariant::fromValue(Sigmod::Map::Building));
 }
 
-void Sigmodr::MapUI::setGui()
+void Sigmodr::Widgets::MapUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Map*>(modified())->name());
     varType->setCurrentIndex(qobject_cast<Sigmod::Map*>(modified())->type());
     varMap->reset();
 }
 
-void Sigmodr::MapUI::apply()
+void Sigmodr::Widgets::MapUI::apply()
 {
     *qobject_cast<Sigmod::Map*>(original()) = *qobject_cast<Sigmod::Map*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapUI::discard()
+void Sigmodr::Widgets::MapUI::discard()
 {
     *qobject_cast<Sigmod::Map*>(modified()) = *qobject_cast<Sigmod::Map*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::MapUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Map*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::MapUI::on_varType_activated(const int type)
+void Sigmodr::Widgets::MapUI::on_varType_activated(const int type)
 {
     qobject_cast<Sigmod::Map*>(modified())->setType(varType->itemData(type).value<Sigmod::Map::Type>());
 }
diff --git a/sigmodr/widgets/MapWarpUI.cpp b/sigmodr/widgets/MapWarpUI.cpp
index 4939bc14..98287112 100644
--- a/sigmodr/widgets/MapWarpUI.cpp
+++ b/sigmodr/widgets/MapWarpUI.cpp
@@ -23,7 +23,7 @@
 #include <sigmod/MapWarp.h>
 #include <sigmod/Sigmod.h>
 
-Sigmodr::MapWarpUI::MapWarpUI(Sigmod::MapWarp* warp, QWidget* parent) :
+Sigmodr::Widgets::MapWarpUI::MapWarpUI(Sigmod::MapWarp* warp, QWidget* parent) :
         ObjectUI(parent),
         m_lastMap(-1)
 {
@@ -31,11 +31,11 @@ Sigmodr::MapWarpUI::MapWarpUI(Sigmod::MapWarp* warp, QWidget* parent) :
     setObjects(warp, new Sigmod::MapWarp(*warp));
 }
 
-Sigmodr::MapWarpUI::~MapWarpUI()
+Sigmodr::Widgets::MapWarpUI::~MapWarpUI()
 {
 }
 
-void Sigmodr::MapWarpUI::initGui()
+void Sigmodr::Widgets::MapWarpUI::initGui()
 {
     varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Door], QVariant::fromValue(Sigmod::MapWarp::Door));
     varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Warp], QVariant::fromValue(Sigmod::MapWarp::Warp));
@@ -43,7 +43,7 @@ void Sigmodr::MapWarpUI::initGui()
     varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Boundary], QVariant::fromValue(Sigmod::MapWarp::Boundary));
 }
 
-void Sigmodr::MapWarpUI::refreshGui()
+void Sigmodr::Widgets::MapWarpUI::refreshGui()
 {
     const bool blocked = varToMap->blockSignals(true);
     varToMap->clear();
@@ -55,7 +55,7 @@ void Sigmodr::MapWarpUI::refreshGui()
     varToMap->blockSignals(blocked);
 }
 
-void Sigmodr::MapWarpUI::setGui()
+void Sigmodr::Widgets::MapWarpUI::setGui()
 {
     const bool resetWarps = (qobject_cast<Sigmod::MapWarp*>(modified())->toMap() != m_lastMap);
     varName->setText(qobject_cast<Sigmod::MapWarp*>(modified())->name());
@@ -81,42 +81,42 @@ void Sigmodr::MapWarpUI::setGui()
     varScript->setValue(qobject_cast<Sigmod::MapWarp*>(modified())->script());
 }
 
-void Sigmodr::MapWarpUI::apply()
+void Sigmodr::Widgets::MapWarpUI::apply()
 {
     *qobject_cast<Sigmod::MapWarp*>(original()) = *qobject_cast<Sigmod::MapWarp*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapWarpUI::discard()
+void Sigmodr::Widgets::MapWarpUI::discard()
 {
     *qobject_cast<Sigmod::MapWarp*>(modified()) = *qobject_cast<Sigmod::MapWarp*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapWarpUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::MapWarpUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::MapWarp*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::MapWarpUI::on_varType_activated(const int type)
+void Sigmodr::Widgets::MapWarpUI::on_varType_activated(const int type)
 {
     qobject_cast<Sigmod::MapWarp*>(modified())->setType(varType->itemData(type).value<Sigmod::MapWarp::Type>());
 }
 
-void Sigmodr::MapWarpUI::on_varToMap_activated(const int toMap)
+void Sigmodr::Widgets::MapWarpUI::on_varToMap_activated(const int toMap)
 {
     qobject_cast<Sigmod::MapWarp*>(modified())->setToMap(toMap);
 }
 
-void Sigmodr::MapWarpUI::on_varToWarp_activated(const int toWarp)
+void Sigmodr::Widgets::MapWarpUI::on_varToWarp_activated(const int toWarp)
 {
     qobject_cast<Sigmod::MapWarp*>(modified())->setToWarp(toWarp);
 }
 
-void Sigmodr::MapWarpUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::MapWarpUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::MapWarp*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/MapWildListEncounterUI.cpp b/sigmodr/widgets/MapWildListEncounterUI.cpp
index 034225f3..456be74b 100644
--- a/sigmodr/widgets/MapWildListEncounterUI.cpp
+++ b/sigmodr/widgets/MapWildListEncounterUI.cpp
@@ -24,18 +24,18 @@
 #include <sigmod/Sigmod.h>
 #include <sigmod/Species.h>
 
-Sigmodr::MapWildListEncounterUI::MapWildListEncounterUI(Sigmod::MapWildListEncounter* encounter, QWidget* parent) :
+Sigmodr::Widgets::MapWildListEncounterUI::MapWildListEncounterUI(Sigmod::MapWildListEncounter* encounter, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(encounter, new Sigmod::MapWildListEncounter(*encounter));
 }
 
-Sigmodr::MapWildListEncounterUI::~MapWildListEncounterUI()
+Sigmodr::Widgets::MapWildListEncounterUI::~MapWildListEncounterUI()
 {
 }
 
-void Sigmodr::MapWildListEncounterUI::refreshGui()
+void Sigmodr::Widgets::MapWildListEncounterUI::refreshGui()
 {
     const bool blocked = varSpecies->blockSignals(true);
     varSpecies->clear();
@@ -48,37 +48,37 @@ void Sigmodr::MapWildListEncounterUI::refreshGui()
     varLevel->setMaximum(sigmod()->rules()->maxLevel());
 }
 
-void Sigmodr::MapWildListEncounterUI::setGui()
+void Sigmodr::Widgets::MapWildListEncounterUI::setGui()
 {
     varSpecies->setCurrentIndex(varSpecies->findData(qobject_cast<Sigmod::MapWildListEncounter*>(modified())->species()));
     varLevel->setValue(qobject_cast<Sigmod::MapWildListEncounter*>(modified())->level());
     varWeight->setValue(qobject_cast<Sigmod::MapWildListEncounter*>(modified())->weight());
 }
 
-void Sigmodr::MapWildListEncounterUI::apply()
+void Sigmodr::Widgets::MapWildListEncounterUI::apply()
 {
     *qobject_cast<Sigmod::MapWildListEncounter*>(original()) = *qobject_cast<Sigmod::MapWildListEncounter*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapWildListEncounterUI::discard()
+void Sigmodr::Widgets::MapWildListEncounterUI::discard()
 {
     *qobject_cast<Sigmod::MapWildListEncounter*>(modified()) = *qobject_cast<Sigmod::MapWildListEncounter*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapWildListEncounterUI::on_varSpecies_activated(const int species)
+void Sigmodr::Widgets::MapWildListEncounterUI::on_varSpecies_activated(const int species)
 {
     qobject_cast<Sigmod::MapWildListEncounter*>(modified())->setSpecies(varSpecies->itemData(species).toInt());
 }
 
-void Sigmodr::MapWildListEncounterUI::on_varLevel_valueChanged(const int level)
+void Sigmodr::Widgets::MapWildListEncounterUI::on_varLevel_valueChanged(const int level)
 {
     qobject_cast<Sigmod::MapWildListEncounter*>(modified())->setLevel(level);
 }
 
-void Sigmodr::MapWildListEncounterUI::on_varWeight_valueChanged(const int weight)
+void Sigmodr::Widgets::MapWildListEncounterUI::on_varWeight_valueChanged(const int weight)
 {
     qobject_cast<Sigmod::MapWildListEncounter*>(modified())->setWeight(weight);
 }
diff --git a/sigmodr/widgets/MapWildListUI.cpp b/sigmodr/widgets/MapWildListUI.cpp
index f1668941..8e2984e0 100644
--- a/sigmodr/widgets/MapWildListUI.cpp
+++ b/sigmodr/widgets/MapWildListUI.cpp
@@ -21,36 +21,36 @@
 // Sigmod includes
 #include <sigmod/MapWildList.h>
 
-Sigmodr::MapWildListUI::MapWildListUI(Sigmod::MapWildList* wildList, QWidget* parent) :
+Sigmodr::Widgets::MapWildListUI::MapWildListUI(Sigmod::MapWildList* wildList, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(wildList, new Sigmod::MapWildList(*wildList));
 }
 
-Sigmodr::MapWildListUI::~MapWildListUI()
+Sigmodr::Widgets::MapWildListUI::~MapWildListUI()
 {
 }
 
-void Sigmodr::MapWildListUI::setGui()
+void Sigmodr::Widgets::MapWildListUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::MapWildList*>(modified())->name());
 }
 
-void Sigmodr::MapWildListUI::apply()
+void Sigmodr::Widgets::MapWildListUI::apply()
 {
     *qobject_cast<Sigmod::MapWildList*>(original()) = *qobject_cast<Sigmod::MapWildList*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MapWildListUI::discard()
+void Sigmodr::Widgets::MapWildListUI::discard()
 {
     *qobject_cast<Sigmod::MapWildList*>(modified()) = *qobject_cast<Sigmod::MapWildList*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MapWildListUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::MapWildListUI::on_varName_textChanged(const QString& name)
 {
     qobject_cast<Sigmod::MapWildList*>(modified())->setName(name);
 }
diff --git a/sigmodr/widgets/MoveUI.cpp b/sigmodr/widgets/MoveUI.cpp
index 6f1be4ff..64140aa0 100644
--- a/sigmodr/widgets/MoveUI.cpp
+++ b/sigmodr/widgets/MoveUI.cpp
@@ -23,18 +23,18 @@
 #include <sigmod/Sigmod.h>
 #include <sigmod/Type.h>
 
-Sigmodr::MoveUI::MoveUI(Sigmod::Move* move, QWidget* parent) :
+Sigmodr::Widgets::MoveUI::MoveUI(Sigmod::Move* move, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(move, new Sigmod::Move(*move));
 }
 
-Sigmodr::MoveUI::~MoveUI()
+Sigmodr::Widgets::MoveUI::~MoveUI()
 {
 }
 
-void Sigmodr::MoveUI::refreshGui()
+void Sigmodr::Widgets::MoveUI::refreshGui()
 {
     const bool blocked = varType->blockSignals(true);
     varType->clear();
@@ -46,7 +46,7 @@ void Sigmodr::MoveUI::refreshGui()
     varType->blockSignals(blocked);
 }
 
-void Sigmodr::MoveUI::setGui()
+void Sigmodr::Widgets::MoveUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Move*>(modified())->name());
     varPriority->setValue(qobject_cast<Sigmod::Move*>(modified())->priority());
@@ -61,74 +61,74 @@ void Sigmodr::MoveUI::setGui()
     varPriorityScript->setValue(qobject_cast<Sigmod::Move*>(modified())->priorityScript());
 }
 
-void Sigmodr::MoveUI::apply()
+void Sigmodr::Widgets::MoveUI::apply()
 {
     *qobject_cast<Sigmod::Move*>(original()) = *qobject_cast<Sigmod::Move*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::MoveUI::discard()
+void Sigmodr::Widgets::MoveUI::discard()
 {
     *qobject_cast<Sigmod::Move*>(modified()) = *qobject_cast<Sigmod::Move*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::MoveUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::MoveUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Move*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::MoveUI::on_varPriority_valueChanged(const int priority)
+void Sigmodr::Widgets::MoveUI::on_varPriority_valueChanged(const int priority)
 {
     qobject_cast<Sigmod::Move*>(modified())->setPriority(priority);
 }
 
-void Sigmodr::MoveUI::on_varAccuracy_valueChanged(const Sigcore::Fraction& accuracy)
+void Sigmodr::Widgets::MoveUI::on_varAccuracy_valueChanged(const Sigcore::Fraction& accuracy)
 {
     qobject_cast<Sigmod::Move*>(modified())->setAccuracy(accuracy);
 }
 
-void Sigmodr::MoveUI::on_varPower_valueChanged(const int power)
+void Sigmodr::Widgets::MoveUI::on_varPower_valueChanged(const int power)
 {
     qobject_cast<Sigmod::Move*>(modified())->setPower(power);
 }
 
-void Sigmodr::MoveUI::on_varType_activated(const int type)
+void Sigmodr::Widgets::MoveUI::on_varType_activated(const int type)
 {
     qobject_cast<Sigmod::Move*>(modified())->setType(varType->itemData(type).toInt());
 }
 
-void Sigmodr::MoveUI::on_varPowerPoints_valueChanged(const int powerPoints)
+void Sigmodr::Widgets::MoveUI::on_varPowerPoints_valueChanged(const int powerPoints)
 {
     qobject_cast<Sigmod::Move*>(modified())->setPowerPoints(powerPoints);
 }
 
-void Sigmodr::MoveUI::on_varSpecial_toggled(const bool special)
+void Sigmodr::Widgets::MoveUI::on_varSpecial_toggled(const bool special)
 {
     qobject_cast<Sigmod::Move*>(modified())->setSpecial(special);
 }
 
-void Sigmodr::MoveUI::on_varDescription_textChanged(const QString& description)
+void Sigmodr::Widgets::MoveUI::on_varDescription_textChanged(const QString& description)
 {
     const int cursor = varDescription->cursorPosition();
     qobject_cast<Sigmod::Move*>(modified())->setDescription(description);
     varDescription->setCursorPosition(cursor);
 }
 
-void Sigmodr::MoveUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
+void Sigmodr::Widgets::MoveUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
 {
     qobject_cast<Sigmod::Move*>(modified())->setBattleScript(battleScript);
 }
 
-void Sigmodr::MoveUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
+void Sigmodr::Widgets::MoveUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
 {
     qobject_cast<Sigmod::Move*>(modified())->setWorldScript(worldScript);
 }
 
-void Sigmodr::MoveUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript)
+void Sigmodr::Widgets::MoveUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript)
 {
     qobject_cast<Sigmod::Move*>(modified())->setPriorityScript(priorityScript);
 }
diff --git a/sigmodr/widgets/NatureUI.cpp b/sigmodr/widgets/NatureUI.cpp
index f78a95cd..09c898c4 100644
--- a/sigmodr/widgets/NatureUI.cpp
+++ b/sigmodr/widgets/NatureUI.cpp
@@ -26,23 +26,23 @@
 // Qt includes
 #include <QtGui/QHeaderView>
 
-Sigmodr::NatureUI::NatureUI(Sigmod::Nature* nature, QWidget* parent) :
+Sigmodr::Widgets::NatureUI::NatureUI(Sigmod::Nature* nature, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(nature, new Sigmod::Nature(*nature));
 }
 
-Sigmodr::NatureUI::~NatureUI()
+Sigmodr::Widgets::NatureUI::~NatureUI()
 {
 }
 
-void Sigmodr::NatureUI::initGui()
+void Sigmodr::Widgets::NatureUI::initGui()
 {
     varStat->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
 }
 
-void Sigmodr::NatureUI::refreshGui()
+void Sigmodr::Widgets::NatureUI::refreshGui()
 {
     const bool isSplit = sigmod()->rules()->specialSplit();
     varStat->clear();
@@ -97,7 +97,7 @@ void Sigmodr::NatureUI::refreshGui()
     }
 }
 
-void Sigmodr::NatureUI::setGui()
+void Sigmodr::Widgets::NatureUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Nature*>(modified())->name());
     varStat->item(Sigmod::ST_Attack - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_Attack), 'g', 7));
@@ -114,37 +114,37 @@ void Sigmodr::NatureUI::setGui()
     varWeight->setValue(qobject_cast<Sigmod::Nature*>(modified())->weight());
 }
 
-void Sigmodr::NatureUI::apply()
+void Sigmodr::Widgets::NatureUI::apply()
 {
     *qobject_cast<Sigmod::Nature*>(original()) = *qobject_cast<Sigmod::Nature*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::NatureUI::discard()
+void Sigmodr::Widgets::NatureUI::discard()
 {
     *qobject_cast<Sigmod::Nature*>(modified()) = *qobject_cast<Sigmod::Nature*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::NatureUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::NatureUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Nature*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::NatureUI::on_varStat_currentCellChanged(const int row)
+void Sigmodr::Widgets::NatureUI::on_varStat_currentCellChanged(const int row)
 {
     varStatMultiplier->setValue(qobject_cast<Sigmod::Nature*>(modified())->stat(varStat->verticalHeaderItem(row)->data(Qt::UserRole).value<Sigmod::Stat>()));
 }
 
-void Sigmodr::NatureUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier)
+void Sigmodr::Widgets::NatureUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier)
 {
     qobject_cast<Sigmod::Nature*>(modified())->setStat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>(), multiplier);
 }
 
-void Sigmodr::NatureUI::on_varWeight_valueChanged(const int weight)
+void Sigmodr::Widgets::NatureUI::on_varWeight_valueChanged(const int weight)
 {
     qobject_cast<Sigmod::Nature*>(modified())->setWeight(weight);
 }
diff --git a/sigmodr/widgets/ObjectUI.cpp b/sigmodr/widgets/ObjectUI.cpp
index f79f4ba0..7e3fa603 100644
--- a/sigmodr/widgets/ObjectUI.cpp
+++ b/sigmodr/widgets/ObjectUI.cpp
@@ -31,7 +31,7 @@
 #include <KMenu>
 #include <KMessageBox>
 
-Sigmodr::ObjectUI::ObjectUI(QWidget* parent) :
+Sigmodr::Widgets::ObjectUI::ObjectUI(QWidget* parent) :
         QWidget(parent),
         m_changed(false),
         m_validator(NULL),
@@ -43,48 +43,48 @@ Sigmodr::ObjectUI::ObjectUI(QWidget* parent) :
     connect(this, SIGNAL(customContextMenuRequested(QPoint)), SLOT(contextMenu(QPoint)));
 }
 
-Sigmodr::ObjectUI::~ObjectUI()
+Sigmodr::Widgets::ObjectUI::~ObjectUI()
 {
     delete m_object_mod;
 }
 
-void Sigmodr::ObjectUI::reload()
+void Sigmodr::Widgets::ObjectUI::reload()
 {
     refreshGui();
     setGui();
 }
 
-bool Sigmodr::ObjectUI::isChanged() const
+bool Sigmodr::Widgets::ObjectUI::isChanged() const
 {
     return m_changed;
 }
 
-const Sigmod::Sigmod* Sigmodr::ObjectUI::sigmod() const
+const Sigmod::Sigmod* Sigmodr::Widgets::ObjectUI::sigmod() const
 {
     return m_object->sigmod();
 }
 
-const Sigmod::Sigmod::Object* Sigmodr::ObjectUI::original() const
+const Sigmod::Sigmod::Object* Sigmodr::Widgets::ObjectUI::original() const
 {
     return m_object;
 }
 
-Sigmod::Object* Sigmodr::ObjectUI::original()
+Sigmod::Object* Sigmodr::Widgets::ObjectUI::original()
 {
     return m_object;
 }
 
-const Sigmod::Object* Sigmodr::ObjectUI::modified() const
+const Sigmod::Object* Sigmodr::Widgets::ObjectUI::modified() const
 {
     return m_object_mod;
 }
 
-Sigmod::Object* Sigmodr::ObjectUI::modified()
+Sigmod::Object* Sigmodr::Widgets::ObjectUI::modified()
 {
     return m_object_mod;
 }
 
-void Sigmodr::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Object* modified)
+void Sigmodr::Widgets::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Object* modified)
 {
     m_object = original;
     m_object_mod = modified;
@@ -99,37 +99,37 @@ void Sigmodr::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Object* mod
     init();
 }
 
-void Sigmodr::ObjectUI::init()
+void Sigmodr::Widgets::ObjectUI::init()
 {
     initGui();
     reload();
     emit(changed(false));
 }
 
-void Sigmodr::ObjectUI::setChanged(const bool changed)
+void Sigmodr::Widgets::ObjectUI::setChanged(const bool changed)
 {
     m_changed = changed;
 }
 
-void Sigmodr::ObjectUI::errorMessage(const QString& message)
+void Sigmodr::Widgets::ObjectUI::errorMessage(const QString& message)
 {
     KMessageBox::error(this, message, "Error");
 }
 
-void Sigmodr::ObjectUI::warningMessage(const QString& message)
+void Sigmodr::Widgets::ObjectUI::warningMessage(const QString& message)
 {
     KMessageBox::warningContinueCancel(this, message, "Warning");
 }
 
-void Sigmodr::ObjectUI::initGui()
+void Sigmodr::Widgets::ObjectUI::initGui()
 {
 }
 
-void Sigmodr::ObjectUI::refreshGui()
+void Sigmodr::Widgets::ObjectUI::refreshGui()
 {
 }
 
-void Sigmodr::ObjectUI::contextMenu(const QPoint& pos)
+void Sigmodr::Widgets::ObjectUI::contextMenu(const QPoint& pos)
 {
     KMenu* menu = new KMenu;
     menu->addAction("&Apply", this, SLOT(apply()));
@@ -142,7 +142,7 @@ void Sigmodr::ObjectUI::contextMenu(const QPoint& pos)
     menu->popup(mapToGlobal(pos));
 }
 
-void Sigmodr::ObjectUI::validate()
+void Sigmodr::Widgets::ObjectUI::validate()
 {
     if (m_changed)
         apply();
diff --git a/sigmodr/widgets/RulesUI.cpp b/sigmodr/widgets/RulesUI.cpp
index 0cd0660e..9ad91860 100644
--- a/sigmodr/widgets/RulesUI.cpp
+++ b/sigmodr/widgets/RulesUI.cpp
@@ -21,18 +21,18 @@
 // Sigmod includes
 #include <sigmod/Rules.h>
 
-Sigmodr::RulesUI::RulesUI(Sigmod::Rules* rules, QWidget* parent) :
+Sigmodr::Widgets::RulesUI::RulesUI(Sigmod::Rules* rules, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(rules, new Sigmod::Rules(*rules));
 }
 
-Sigmodr::RulesUI::~RulesUI()
+Sigmodr::Widgets::RulesUI::~RulesUI()
 {
 }
 
-void Sigmodr::RulesUI::setGui()
+void Sigmodr::Widgets::RulesUI::setGui()
 {
     varGenders->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->genderAllowed() ? Qt::Checked : Qt::Unchecked);
     varBreeding->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->breedingAllowed() ? Qt::Checked : Qt::Unchecked);
@@ -66,132 +66,132 @@ void Sigmodr::RulesUI::setGui()
     varMaxTotalWeight->setValue(qobject_cast<Sigmod::Rules*>(modified())->maxTotalWeight());
 }
 
-void Sigmodr::RulesUI::apply()
+void Sigmodr::Widgets::RulesUI::apply()
 {
     *qobject_cast<Sigmod::Rules*>(original()) = *qobject_cast<Sigmod::Rules*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::RulesUI::discard()
+void Sigmodr::Widgets::RulesUI::discard()
 {
     *qobject_cast<Sigmod::Rules*>(modified()) = *qobject_cast<Sigmod::Rules*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::RulesUI::on_varGenders_toggled(const bool genders)
+void Sigmodr::Widgets::RulesUI::on_varGenders_toggled(const bool genders)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setGenderAllowed(genders);
 }
 
-void Sigmodr::RulesUI::on_varBreeding_toggled(const bool breeding)
+void Sigmodr::Widgets::RulesUI::on_varBreeding_toggled(const bool breeding)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setBreedingAllowed(breeding);
 }
 
-void Sigmodr::RulesUI::on_varCriticalDomains_toggled(const bool criticalDomains)
+void Sigmodr::Widgets::RulesUI::on_varCriticalDomains_toggled(const bool criticalDomains)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setCriticalDomains(criticalDomains);
 }
 
-void Sigmodr::RulesUI::on_varSwitchStyle_toggled(const bool switchStyle)
+void Sigmodr::Widgets::RulesUI::on_varSwitchStyle_toggled(const bool switchStyle)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setAllowSwitchStyle(switchStyle);
 }
 
-void Sigmodr::RulesUI::on_varUseATB_toggled(const bool useATB)
+void Sigmodr::Widgets::RulesUI::on_varUseATB_toggled(const bool useATB)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setUseATB(useATB);
 }
 
-void Sigmodr::RulesUI::on_varSplitSpecial_toggled(const bool splitSpecial)
+void Sigmodr::Widgets::RulesUI::on_varSplitSpecial_toggled(const bool splitSpecial)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setSpecialSplit(splitSpecial);
     if (!splitSpecial)
         qobject_cast<Sigmod::Rules*>(modified())->setSpecialDVSplit(false);
 }
 
-void Sigmodr::RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV)
+void Sigmodr::Widgets::RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setSpecialDVSplit(splitSpecialDV);
 }
 
-void Sigmodr::RulesUI::on_varEffortValues_toggled(const bool effortValues)
+void Sigmodr::Widgets::RulesUI::on_varEffortValues_toggled(const bool effortValues)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setEffortValuesAllowed(effortValues);
 }
 
-void Sigmodr::RulesUI::on_varMaxEV_valueChanged(const int maxEV)
+void Sigmodr::Widgets::RulesUI::on_varMaxEV_valueChanged(const int maxEV)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxTotalEV(maxEV);
 }
 
-void Sigmodr::RulesUI::on_varMaxEVPerStat_valueChanged(const int maxEVPerStat)
+void Sigmodr::Widgets::RulesUI::on_varMaxEVPerStat_valueChanged(const int maxEVPerStat)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxEVPerStat(maxEVPerStat);
 }
 
-void Sigmodr::RulesUI::on_varBoxes_valueChanged(const int boxes)
+void Sigmodr::Widgets::RulesUI::on_varBoxes_valueChanged(const int boxes)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setNumBoxes(boxes);
 }
 
-void Sigmodr::RulesUI::on_varBoxSize_valueChanged(const int boxSize)
+void Sigmodr::Widgets::RulesUI::on_varBoxSize_valueChanged(const int boxSize)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setBoxSize(boxSize);
 }
 
-void Sigmodr::RulesUI::on_varMaxParty_valueChanged(const int maxParty)
+void Sigmodr::Widgets::RulesUI::on_varMaxParty_valueChanged(const int maxParty)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxParty(maxParty);
 }
 
-void Sigmodr::RulesUI::on_varMaxFight_valueChanged(const int maxFight)
+void Sigmodr::Widgets::RulesUI::on_varMaxFight_valueChanged(const int maxFight)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxFight(maxFight);
 }
 
-void Sigmodr::RulesUI::on_varMaxPlayers_valueChanged(const int maxPlayers)
+void Sigmodr::Widgets::RulesUI::on_varMaxPlayers_valueChanged(const int maxPlayers)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxPlayers(maxPlayers);
 }
 
-void Sigmodr::RulesUI::on_varMaxMoves_valueChanged(const int maxMoves)
+void Sigmodr::Widgets::RulesUI::on_varMaxMoves_valueChanged(const int maxMoves)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxMoves(maxMoves);
 }
 
-void Sigmodr::RulesUI::on_varMaxLevel_valueChanged(const int maxLevel)
+void Sigmodr::Widgets::RulesUI::on_varMaxLevel_valueChanged(const int maxLevel)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxLevel(maxLevel);
 }
 
-void Sigmodr::RulesUI::on_varMaxHeldItems_valueChanged(const int maxHeldItems)
+void Sigmodr::Widgets::RulesUI::on_varMaxHeldItems_valueChanged(const int maxHeldItems)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxHeldItems(maxHeldItems);
 }
 
-void Sigmodr::RulesUI::on_varMaxNatures_valueChanged(const int maxNatures)
+void Sigmodr::Widgets::RulesUI::on_varMaxNatures_valueChanged(const int maxNatures)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxNatures(maxNatures);
 }
 
-void Sigmodr::RulesUI::on_varMaxAbilities_valueChanged(const int maxAbilities)
+void Sigmodr::Widgets::RulesUI::on_varMaxAbilities_valueChanged(const int maxAbilities)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxAbilities(maxAbilities);
 }
 
-void Sigmodr::RulesUI::on_varMaxStages_valueChanged(const int maxStages)
+void Sigmodr::Widgets::RulesUI::on_varMaxStages_valueChanged(const int maxStages)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxStages(maxStages);
 }
 
-void Sigmodr::RulesUI::on_varMaxMoney_valueChanged(const int maxMoney)
+void Sigmodr::Widgets::RulesUI::on_varMaxMoney_valueChanged(const int maxMoney)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxMoney(maxMoney);
 }
 
-void Sigmodr::RulesUI::on_varMaxTotalWeight_valueChanged(const int maxTotalWeight)
+void Sigmodr::Widgets::RulesUI::on_varMaxTotalWeight_valueChanged(const int maxTotalWeight)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setMaxTotalWeight(maxTotalWeight);
 }
diff --git a/sigmodr/widgets/ScriptWidget.cpp b/sigmodr/widgets/ScriptWidget.cpp
index d31a5178..207f9e90 100644
--- a/sigmodr/widgets/ScriptWidget.cpp
+++ b/sigmodr/widgets/ScriptWidget.cpp
@@ -32,7 +32,7 @@
 #include <KTextEditor/EditorChooser>
 #include <KTextEditor/View>
 
-Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& value) :
+Sigmodr::Widgets::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& value) :
         QWidget(parent),
         m_value(value),
         m_simpleEdit(NULL),
@@ -102,18 +102,18 @@ Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& valu
     setGui();
 }
 
-Sigmodr::ScriptWidget::~ScriptWidget()
+Sigmodr::Widgets::ScriptWidget::~ScriptWidget()
 {
     if (m_editor)
         m_editor->writeConfig(NULL);
 }
 
-Sigcore::Script Sigmodr::ScriptWidget::value() const
+Sigcore::Script Sigmodr::Widgets::ScriptWidget::value() const
 {
     return m_value;
 }
 
-void Sigmodr::ScriptWidget::setGui()
+void Sigmodr::Widgets::ScriptWidget::setGui()
 {
     varInterpreter->setCurrentIndex(varInterpreter->findData(m_value.interpreter()));
     if (m_document)
@@ -131,7 +131,7 @@ void Sigmodr::ScriptWidget::setGui()
     }
 }
 
-void Sigmodr::ScriptWidget::setValue(const Sigcore::Script& value)
+void Sigmodr::Widgets::ScriptWidget::setValue(const Sigcore::Script& value)
 {
     if (m_value != value)
     {
@@ -140,7 +140,7 @@ void Sigmodr::ScriptWidget::setValue(const Sigcore::Script& value)
     }
 }
 
-void Sigmodr::ScriptWidget::on_varInterpreter_activated()
+void Sigmodr::Widgets::ScriptWidget::on_varInterpreter_activated()
 {
     m_value.setInterpreter(varInterpreter->itemData(varInterpreter->currentIndex()).toString());
     if (m_document)
@@ -148,7 +148,7 @@ void Sigmodr::ScriptWidget::on_varInterpreter_activated()
     emit(valueChanged(m_value));
 }
 
-void Sigmodr::ScriptWidget::scriptChanged()
+void Sigmodr::Widgets::ScriptWidget::scriptChanged()
 {
     if (m_document)
     {
@@ -168,14 +168,14 @@ void Sigmodr::ScriptWidget::scriptChanged()
     }
 }
 
-void Sigmodr::ScriptWidget::focused(KTextEditor::View* view)
+void Sigmodr::Widgets::ScriptWidget::focused(KTextEditor::View* view)
 {
     KXmlGuiWindow* topLevel = qobject_cast<KXmlGuiWindow*>(KApplication::kApplication()->activeWindow());
     if (topLevel)
         topLevel->guiFactory()->addClient(view);
 }
 
-void Sigmodr::ScriptWidget::unfocused(KTextEditor::View* view)
+void Sigmodr::Widgets::ScriptWidget::unfocused(KTextEditor::View* view)
 {
     KXmlGuiWindow* topLevel = qobject_cast<KXmlGuiWindow*>(KApplication::kApplication()->activeWindow());
     QWidget* focused = KApplication::focusWidget();
diff --git a/sigmodr/widgets/SigmodUI.cpp b/sigmodr/widgets/SigmodUI.cpp
index b8cefc43..fd8551e0 100644
--- a/sigmodr/widgets/SigmodUI.cpp
+++ b/sigmodr/widgets/SigmodUI.cpp
@@ -27,7 +27,7 @@
 #include <sigmod/Sigmod.h>
 #include <sigmod/Type.h>
 
-Sigmodr::SigmodUI::SigmodUI(Sigmod::Sigmod* sigmod, QWidget* parent) :
+Sigmodr::Widgets::SigmodUI::SigmodUI(Sigmod::Sigmod* sigmod, QWidget* parent) :
         ObjectUI(parent),
         m_changingMult(true)
 {
@@ -35,11 +35,11 @@ Sigmodr::SigmodUI::SigmodUI(Sigmod::Sigmod* sigmod, QWidget* parent) :
     setObjects(sigmod, new Sigmod::Sigmod(*sigmod));
 }
 
-Sigmodr::SigmodUI::~SigmodUI()
+Sigmodr::Widgets::SigmodUI::~SigmodUI()
 {
 }
 
-void Sigmodr::SigmodUI::initGui()
+void Sigmodr::Widgets::SigmodUI::initGui()
 {
     QStringList types;
     for (int i = 0; i < qobject_cast<Sigmod::Sigmod*>(original())->typeCount(); ++i)
@@ -47,12 +47,12 @@ void Sigmodr::SigmodUI::initGui()
     varTypechart->setModel(new TypechartModel(qobject_cast<Sigmod::Sigmod*>(modified())->typechart(), types));
 }
 
-void Sigmodr::SigmodUI::refreshGui()
+void Sigmodr::Widgets::SigmodUI::refreshGui()
 {
     varEffectiveness->setEnabled(false);
 }
 
-void Sigmodr::SigmodUI::setGui()
+void Sigmodr::Widgets::SigmodUI::setGui()
 {
     varTitle->setText(qobject_cast<Sigmod::Sigmod*>(modified())->title());
     varVersion->setText(qobject_cast<Sigmod::Sigmod*>(modified())->version());
@@ -61,13 +61,13 @@ void Sigmodr::SigmodUI::setGui()
     varStartScript->setValue(qobject_cast<Sigmod::Sigmod*>(modified())->startScript());
 }
 
-void Sigmodr::SigmodUI::apply()
+void Sigmodr::Widgets::SigmodUI::apply()
 {
     *qobject_cast<Sigmod::Sigmod*>(original()) = *qobject_cast<Sigmod::Sigmod*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::SigmodUI::discard()
+void Sigmodr::Widgets::SigmodUI::discard()
 {
     *qobject_cast<Sigmod::Sigmod*>(modified()) = *qobject_cast<Sigmod::Sigmod*>(original());
     setGui();
@@ -75,38 +75,38 @@ void Sigmodr::SigmodUI::discard()
     emit(changed(false));
 }
 
-void Sigmodr::SigmodUI::on_varTitle_textChanged(const QString& title)
+void Sigmodr::Widgets::SigmodUI::on_varTitle_textChanged(const QString& title)
 {
     const int cursor = varTitle->cursorPosition();
     qobject_cast<Sigmod::Sigmod*>(modified())->setTitle(title);
     varTitle->setCursorPosition(cursor);
 }
 
-void Sigmodr::SigmodUI::on_varVersion_textChanged(const QString& version)
+void Sigmodr::Widgets::SigmodUI::on_varVersion_textChanged(const QString& version)
 {
     const int cursor = varVersion->cursorPosition();
     qobject_cast<Sigmod::Sigmod*>(modified())->setVersion(version);
     varVersion->setCursorPosition(cursor);
 }
 
-void Sigmodr::SigmodUI::on_varDescription_textChanged(const QString& description)
+void Sigmodr::Widgets::SigmodUI::on_varDescription_textChanged(const QString& description)
 {
     const int cursor = varDescription->cursorPosition();
     qobject_cast<Sigmod::Sigmod*>(modified())->setDescription(description);
     varDescription->setCursorPosition(cursor);
 }
 
-void Sigmodr::SigmodUI::on_varSinglePlayer_clicked(const bool singlePlayer)
+void Sigmodr::Widgets::SigmodUI::on_varSinglePlayer_clicked(const bool singlePlayer)
 {
     qobject_cast<Sigmod::Sigmod*>(modified())->setSinglePlayer(singlePlayer);
 }
 
-void Sigmodr::SigmodUI::on_varStartScript_valueChanged(const Sigcore::Script& startScript)
+void Sigmodr::Widgets::SigmodUI::on_varStartScript_valueChanged(const Sigcore::Script& startScript)
 {
     qobject_cast<Sigmod::Sigmod*>(modified())->setStartScript(startScript);
 }
 
-void Sigmodr::SigmodUI::on_varTypechart_clicked(const QModelIndex& index)
+void Sigmodr::Widgets::SigmodUI::on_varTypechart_clicked(const QModelIndex& index)
 {
     m_index = index;
     m_changingMult = true;
@@ -115,7 +115,7 @@ void Sigmodr::SigmodUI::on_varTypechart_clicked(const QModelIndex& index)
     varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Sigcore::Fraction>());
 }
 
-void Sigmodr::SigmodUI::on_varEffectiveness_valueChanged(const Sigcore::Fraction& multiplier)
+void Sigmodr::Widgets::SigmodUI::on_varEffectiveness_valueChanged(const Sigcore::Fraction& multiplier)
 {
     varTypechart->model()->setData(m_index, QVariant::fromValue(multiplier), Qt::EditRole);
     if (!m_changingMult)
diff --git a/sigmodr/widgets/SkinUI.cpp b/sigmodr/widgets/SkinUI.cpp
index cbc7b041..afcb30c3 100644
--- a/sigmodr/widgets/SkinUI.cpp
+++ b/sigmodr/widgets/SkinUI.cpp
@@ -21,44 +21,44 @@
 // Sigmod includes
 #include <sigmod/Skin.h>
 
-Sigmodr::SkinUI::SkinUI(Sigmod::Skin* skin, QWidget* parent) :
+Sigmodr::Widgets::SkinUI::SkinUI(Sigmod::Skin* skin, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(skin, new Sigmod::Skin(*skin));
 }
 
-Sigmodr::SkinUI::~SkinUI()
+Sigmodr::Widgets::SkinUI::~SkinUI()
 {
 }
 
-void Sigmodr::SkinUI::setGui()
+void Sigmodr::Widgets::SkinUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Skin*>(modified())->name());
     varScript->setValue(qobject_cast<Sigmod::Skin*>(modified())->script());
 }
 
-void Sigmodr::SkinUI::apply()
+void Sigmodr::Widgets::SkinUI::apply()
 {
     *qobject_cast<Sigmod::Skin*>(original()) = *qobject_cast<Sigmod::Skin*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::SkinUI::discard()
+void Sigmodr::Widgets::SkinUI::discard()
 {
     *qobject_cast<Sigmod::Skin*>(modified()) = *qobject_cast<Sigmod::Skin*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::SkinUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::SkinUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Skin*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::SkinUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::SkinUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::Skin*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/SoundUI.cpp b/sigmodr/widgets/SoundUI.cpp
index d2c202cf..12330e04 100644
--- a/sigmodr/widgets/SoundUI.cpp
+++ b/sigmodr/widgets/SoundUI.cpp
@@ -36,7 +36,7 @@
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
 
-Sigmodr::SoundUI::SoundUI(Sigmod::Sound* sound, QWidget* parent) :
+Sigmodr::Widgets::SoundUI::SoundUI(Sigmod::Sound* sound, QWidget* parent) :
         ObjectUI(parent),
         m_output(new Phonon::AudioOutput(Phonon::MusicCategory, this)),
         m_media(new Phonon::MediaObject(this)),
@@ -46,13 +46,13 @@ Sigmodr::SoundUI::SoundUI(Sigmod::Sound* sound, QWidget* parent) :
     setObjects(sound, new Sigmod::Sound(*sound));
 }
 
-Sigmodr::SoundUI::~SoundUI()
+Sigmodr::Widgets::SoundUI::~SoundUI()
 {
     delete m_media;
     delete m_buffer;
 }
 
-void Sigmodr::SoundUI::initGui()
+void Sigmodr::Widgets::SoundUI::initGui()
 {
     Phonon::createPath(m_media, m_output);
     m_media->setTickInterval(100);
@@ -69,37 +69,37 @@ void Sigmodr::SoundUI::initGui()
     buttonBrowse->setIcon(KIcon("document-open"));
 }
 
-void Sigmodr::SoundUI::refreshGui()
+void Sigmodr::Widgets::SoundUI::refreshGui()
 {
     resetAudioData();
 }
 
-void Sigmodr::SoundUI::setGui()
+void Sigmodr::Widgets::SoundUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Sound*>(modified())->name());
 }
 
-void Sigmodr::SoundUI::apply()
+void Sigmodr::Widgets::SoundUI::apply()
 {
     *qobject_cast<Sigmod::Sound*>(original()) = *qobject_cast<Sigmod::Sound*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::SoundUI::discard()
+void Sigmodr::Widgets::SoundUI::discard()
 {
     *qobject_cast<Sigmod::Sound*>(modified()) = *qobject_cast<Sigmod::Sound*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::SoundUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::SoundUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Sound*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::SoundUI::on_buttonBrowse_clicked()
+void Sigmodr::Widgets::SoundUI::on_buttonBrowse_clicked()
 {
     QFile file(KFileDialog::getOpenFileName(KUrl("kfiledialog:///audio"), "audio/*|Audio files", this));
     if (file.open(QIODevice::ReadOnly))
@@ -110,7 +110,7 @@ void Sigmodr::SoundUI::on_buttonBrowse_clicked()
     }
 }
 
-void Sigmodr::SoundUI::stateChanged(Phonon::State newState, Phonon::State oldState)
+void Sigmodr::Widgets::SoundUI::stateChanged(Phonon::State newState, Phonon::State oldState)
 {
     Q_UNUSED(oldState)
     switch (newState)
@@ -142,7 +142,7 @@ void Sigmodr::SoundUI::stateChanged(Phonon::State newState, Phonon::State oldSta
     }
 }
 
-void Sigmodr::SoundUI::resetAudioData()
+void Sigmodr::Widgets::SoundUI::resetAudioData()
 {
     m_media->stop();
     m_buffer->setData(qobject_cast<Sigmod::Sound*>(modified())->data());
@@ -150,7 +150,7 @@ void Sigmodr::SoundUI::resetAudioData()
     tick(0);
 }
 
-void Sigmodr::SoundUI::tick(qint64 time)
+void Sigmodr::Widgets::SoundUI::tick(qint64 time)
 {
     QTime currentTime(0, (time / 60000) % 60, (time / 1000) % 60, time % 1000);
     qint64 total = m_media->totalTime();
diff --git a/sigmodr/widgets/SpeciesMoveUI.cpp b/sigmodr/widgets/SpeciesMoveUI.cpp
index ae60a424..f2638220 100644
--- a/sigmodr/widgets/SpeciesMoveUI.cpp
+++ b/sigmodr/widgets/SpeciesMoveUI.cpp
@@ -24,18 +24,18 @@
 #include <sigmod/Sigmod.h>
 #include <sigmod/SpeciesMove.h>
 
-Sigmodr::SpeciesMoveUI::SpeciesMoveUI(Sigmod::SpeciesMove* move, QWidget* parent) :
+Sigmodr::Widgets::SpeciesMoveUI::SpeciesMoveUI(Sigmod::SpeciesMove* move, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(move, new Sigmod::SpeciesMove(*move));
 }
 
-Sigmodr::SpeciesMoveUI::~SpeciesMoveUI()
+Sigmodr::Widgets::SpeciesMoveUI::~SpeciesMoveUI()
 {
 }
 
-void Sigmodr::SpeciesMoveUI::refreshGui()
+void Sigmodr::Widgets::SpeciesMoveUI::refreshGui()
 {
     const bool blocked = varMove->blockSignals(true);
     varMove->clear();
@@ -49,37 +49,37 @@ void Sigmodr::SpeciesMoveUI::refreshGui()
     varWildLevel->setMaximum(sigmod()->rules()->maxLevel());
 }
 
-void Sigmodr::SpeciesMoveUI::setGui()
+void Sigmodr::Widgets::SpeciesMoveUI::setGui()
 {
     varMove->setCurrentIndex(varMove->findData(qobject_cast<Sigmod::SpeciesMove*>(modified())->move()));
     varLevel->setValue(qobject_cast<Sigmod::SpeciesMove*>(modified())->level());
     varWildLevel->setValue(qobject_cast<Sigmod::SpeciesMove*>(modified())->wild());
 }
 
-void Sigmodr::SpeciesMoveUI::apply()
+void Sigmodr::Widgets::SpeciesMoveUI::apply()
 {
     *qobject_cast<Sigmod::SpeciesMove*>(original()) = *qobject_cast<Sigmod::SpeciesMove*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::SpeciesMoveUI::discard()
+void Sigmodr::Widgets::SpeciesMoveUI::discard()
 {
     *qobject_cast<Sigmod::SpeciesMove*>(modified()) = *qobject_cast<Sigmod::SpeciesMove*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::SpeciesMoveUI::on_varMove_activated(const int move)
+void Sigmodr::Widgets::SpeciesMoveUI::on_varMove_activated(const int move)
 {
     qobject_cast<Sigmod::SpeciesMove*>(modified())->setMove(varMove->itemData(move).toInt());
 }
 
-void Sigmodr::SpeciesMoveUI::on_varLevel_valueChanged(const int level)
+void Sigmodr::Widgets::SpeciesMoveUI::on_varLevel_valueChanged(const int level)
 {
     qobject_cast<Sigmod::SpeciesMove*>(modified())->setLevel(level);
 }
 
-void Sigmodr::SpeciesMoveUI::on_varWildLevel_valueChanged(const int wildLevel)
+void Sigmodr::Widgets::SpeciesMoveUI::on_varWildLevel_valueChanged(const int wildLevel)
 {
     qobject_cast<Sigmod::SpeciesMove*>(modified())->setWild(wildLevel);
 }
diff --git a/sigmodr/widgets/SpeciesUI.cpp b/sigmodr/widgets/SpeciesUI.cpp
index e41eeab8..1ec70549 100644
--- a/sigmodr/widgets/SpeciesUI.cpp
+++ b/sigmodr/widgets/SpeciesUI.cpp
@@ -33,18 +33,18 @@
 #include <QtGui/QHeaderView>
 #include <QtGui/QListWidget>
 
-Sigmodr::SpeciesUI::SpeciesUI(Sigmod::Species* species, QWidget* parent) :
+Sigmodr::Widgets::SpeciesUI::SpeciesUI(Sigmod::Species* species, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(species, new Sigmod::Species(*species));
 }
 
-Sigmodr::SpeciesUI::~SpeciesUI()
+Sigmodr::Widgets::SpeciesUI::~SpeciesUI()
 {
 }
 
-void Sigmodr::SpeciesUI::initGui()
+void Sigmodr::Widgets::SpeciesUI::initGui()
 {
     varGrowth->addItem(Sigmod::Species::StyleStr[Sigmod::Species::Fluctuating], QVariant::fromValue(Sigmod::Species::Fluctuating));
     varGrowth->addItem(Sigmod::Species::StyleStr[Sigmod::Species::Fading], QVariant::fromValue(Sigmod::Species::Fading));
@@ -58,7 +58,7 @@ void Sigmodr::SpeciesUI::initGui()
     connect(varItems->selectedListWidget(), SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(selectedItemChanged(QListWidgetItem*)));
 }
 
-void Sigmodr::SpeciesUI::refreshGui()
+void Sigmodr::Widgets::SpeciesUI::refreshGui()
 {
     const bool isSplit = sigmod()->rules()->specialSplit();
     varBaseStat->clear();
@@ -249,7 +249,7 @@ void Sigmodr::SpeciesUI::refreshGui()
     boxItems->setEnabled(sigmod()->rules()->maxHeldItems());
 }
 
-void Sigmodr::SpeciesUI::setGui()
+void Sigmodr::Widgets::SpeciesUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Species*>(modified())->name());
     varBaseStat->item(Sigmod::ST_Attack - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Species*>(modified())->baseStat(Sigmod::ST_Attack)));
@@ -364,183 +364,183 @@ void Sigmodr::SpeciesUI::setGui()
         varItemWeight->setValue(qobject_cast<Sigmod::Species*>(modified())->ability(selectedItem->data(Qt::UserRole).toInt()));
 }
 
-void Sigmodr::SpeciesUI::apply()
+void Sigmodr::Widgets::SpeciesUI::apply()
 {
     *qobject_cast<Sigmod::Species*>(original()) = *qobject_cast<Sigmod::Species*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::SpeciesUI::discard()
+void Sigmodr::Widgets::SpeciesUI::discard()
 {
     *qobject_cast<Sigmod::Species*>(modified()) = *qobject_cast<Sigmod::Species*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::SpeciesUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::SpeciesUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Species*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::SpeciesUI::on_varBaseStat_currentCellChanged(const int row)
+void Sigmodr::Widgets::SpeciesUI::on_varBaseStat_currentCellChanged(const int row)
 {
     varBaseStatValue->setValue(qobject_cast<Sigmod::Species*>(modified())->baseStat(varBaseStat->verticalHeaderItem(row)->data(Qt::UserRole).value<Sigmod::Stat>()));
 }
 
-void Sigmodr::SpeciesUI::on_varBaseStatValue_valueChanged(const int baseStat)
+void Sigmodr::Widgets::SpeciesUI::on_varBaseStatValue_valueChanged(const int baseStat)
 {
     qobject_cast<Sigmod::Species*>(modified())->setBaseStat(varBaseStat->verticalHeaderItem(varBaseStat->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>(), baseStat);
 }
 
-void Sigmodr::SpeciesUI::on_varEffortValue_currentCellChanged(const int row)
+void Sigmodr::Widgets::SpeciesUI::on_varEffortValue_currentCellChanged(const int row)
 {
     varEffortValueValue->setValue(qobject_cast<Sigmod::Species*>(modified())->effortValue(varEffortValue->verticalHeaderItem(row)->data(Qt::UserRole).value<Sigmod::Stat>()));
 }
 
-void Sigmodr::SpeciesUI::on_varEffortValueValue_valueChanged(const int effortValue)
+void Sigmodr::Widgets::SpeciesUI::on_varEffortValueValue_valueChanged(const int effortValue)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEffortValue(varEffortValue->verticalHeaderItem(varEffortValue->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>(), effortValue);
 }
 
-void Sigmodr::SpeciesUI::on_varGrowth_activated(const int growth)
+void Sigmodr::Widgets::SpeciesUI::on_varGrowth_activated(const int growth)
 {
     qobject_cast<Sigmod::Species*>(modified())->setGrowth(QVariant(growth).value<Sigmod::Species::Style>());
 }
 
-void Sigmodr::SpeciesUI::on_varExperienceValue_valueChanged(const int experienceValue)
+void Sigmodr::Widgets::SpeciesUI::on_varExperienceValue_valueChanged(const int experienceValue)
 {
     qobject_cast<Sigmod::Species*>(modified())->setExperienceValue(experienceValue);
 }
 
-void Sigmodr::SpeciesUI::on_varCatchValue_valueChanged(const int catchValue)
+void Sigmodr::Widgets::SpeciesUI::on_varCatchValue_valueChanged(const int catchValue)
 {
     qobject_cast<Sigmod::Species*>(modified())->setCatchValue(catchValue);
 }
 
-void Sigmodr::SpeciesUI::on_varMaxHoldWeight_valueChanged(const int maxHoldWeight)
+void Sigmodr::Widgets::SpeciesUI::on_varMaxHoldWeight_valueChanged(const int maxHoldWeight)
 {
     qobject_cast<Sigmod::Species*>(modified())->setMaxHoldWeight(maxHoldWeight);
 }
 
-void Sigmodr::SpeciesUI::on_varRunChance_valueChanged(const Sigcore::Fraction& runChance)
+void Sigmodr::Widgets::SpeciesUI::on_varRunChance_valueChanged(const Sigcore::Fraction& runChance)
 {
     qobject_cast<Sigmod::Species*>(modified())->setRunChance(runChance);
 }
 
-void Sigmodr::SpeciesUI::on_varItemChance_valueChanged(const Sigcore::Fraction& itemChance)
+void Sigmodr::Widgets::SpeciesUI::on_varItemChance_valueChanged(const Sigcore::Fraction& itemChance)
 {
     qobject_cast<Sigmod::Species*>(modified())->setItemChance(itemChance);
 }
 
-void Sigmodr::SpeciesUI::on_varEncyclopediaNumber_valueChanged(const int encyclopediaNumber)
+void Sigmodr::Widgets::SpeciesUI::on_varEncyclopediaNumber_valueChanged(const int encyclopediaNumber)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEncyclopediaNumber(encyclopediaNumber);
 }
 
-void Sigmodr::SpeciesUI::on_varWeight_valueChanged(const int weight)
+void Sigmodr::Widgets::SpeciesUI::on_varWeight_valueChanged(const int weight)
 {
     qobject_cast<Sigmod::Species*>(modified())->setWeight(weight);
 }
 
-void Sigmodr::SpeciesUI::on_varHeight_valueChanged(const int height)
+void Sigmodr::Widgets::SpeciesUI::on_varHeight_valueChanged(const int height)
 {
     qobject_cast<Sigmod::Species*>(modified())->setHeight(height);
 }
 
-void Sigmodr::SpeciesUI::on_varEncyclopediaEntry_textChanged(const QString& encyclopediaEntry)
+void Sigmodr::Widgets::SpeciesUI::on_varEncyclopediaEntry_textChanged(const QString& encyclopediaEntry)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEncyclopediaEntry(encyclopediaEntry);
 }
 
-void Sigmodr::SpeciesUI::on_varMaleFront_currentIndexChanged(const int maleFront)
+void Sigmodr::Widgets::SpeciesUI::on_varMaleFront_currentIndexChanged(const int maleFront)
 {
     qobject_cast<Sigmod::Species*>(modified())->setFrontMaleSprite(varMaleFront->itemData(maleFront).toInt());
 }
 
-void Sigmodr::SpeciesUI::on_varMaleBack_currentIndexChanged(const int maleBack)
+void Sigmodr::Widgets::SpeciesUI::on_varMaleBack_currentIndexChanged(const int maleBack)
 {
     qobject_cast<Sigmod::Species*>(modified())->setBackMaleSprite(varMaleBack->itemData(maleBack).toInt());
 }
 
-void Sigmodr::SpeciesUI::on_varFemaleFront_currentIndexChanged(const int femaleFront)
+void Sigmodr::Widgets::SpeciesUI::on_varFemaleFront_currentIndexChanged(const int femaleFront)
 {
     qobject_cast<Sigmod::Species*>(modified())->setFrontFemaleSprite(varFemaleFront->itemData(femaleFront).toInt());
 }
 
-void Sigmodr::SpeciesUI::on_varFemaleBack_currentIndexChanged(const int femaleBack)
+void Sigmodr::Widgets::SpeciesUI::on_varFemaleBack_currentIndexChanged(const int femaleBack)
 {
     qobject_cast<Sigmod::Species*>(modified())->setBackFemaleSprite(varFemaleBack->itemData(femaleBack).toInt());
 }
 
-void Sigmodr::SpeciesUI::on_varSkin_currentIndexChanged(const int skin)
+void Sigmodr::Widgets::SpeciesUI::on_varSkin_currentIndexChanged(const int skin)
 {
     qobject_cast<Sigmod::Species*>(modified())->setSkin(varSkin->itemData(skin).toInt());
 }
 
-void Sigmodr::SpeciesUI::on_varHasGender_toggled(const bool hasGender)
+void Sigmodr::Widgets::SpeciesUI::on_varHasGender_toggled(const bool hasGender)
 {
     qobject_cast<Sigmod::Species*>(modified())->setGenderFactor(Sigcore::Fraction((hasGender ? 1 : -1), 1));
 }
 
-void Sigmodr::SpeciesUI::on_varGenderChance_valueChanged(const Sigcore::Fraction& genderChance)
+void Sigmodr::Widgets::SpeciesUI::on_varGenderChance_valueChanged(const Sigcore::Fraction& genderChance)
 {
     qobject_cast<Sigmod::Species*>(modified())->setGenderFactor(genderChance);
 }
 
-void Sigmodr::SpeciesUI::on_varEggSpecies_activated(const int eggSpecies)
+void Sigmodr::Widgets::SpeciesUI::on_varEggSpecies_activated(const int eggSpecies)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEggSpecies(varEggSpecies->itemData(eggSpecies).toInt());
 }
 
-void Sigmodr::SpeciesUI::on_varEggSteps_valueChanged(const int eggSteps)
+void Sigmodr::Widgets::SpeciesUI::on_varEggSteps_valueChanged(const int eggSteps)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEggSteps(eggSteps);
 }
 
-void Sigmodr::SpeciesUI::on_varEvolution_valueChanged(const Sigcore::Script& evolution)
+void Sigmodr::Widgets::SpeciesUI::on_varEvolution_valueChanged(const Sigcore::Script& evolution)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEvolution(evolution);
 }
 
-void Sigmodr::SpeciesUI::on_varTypes_added(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varTypes_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setType(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varTypes_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varTypes_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setType(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varEggGroups_added(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varEggGroups_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEggGroup(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varEggGroups_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varEggGroups_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setEggGroup(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varAbilities_added(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varAbilities_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), 1);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varAbilities_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varAbilities_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), 0);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::selectedAbilityChanged(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::selectedAbilityChanged(QListWidgetItem* item)
 {
     if (item)
         varAbilityWeight->setValue(qobject_cast<Sigmod::Species*>(modified())->ability(item->data(Qt::UserRole).toInt()));
@@ -548,26 +548,26 @@ void Sigmodr::SpeciesUI::selectedAbilityChanged(QListWidgetItem* item)
         varAbilityWeight->setEnabled(false);
 }
 
-void Sigmodr::SpeciesUI::on_varAbilityWeight_valueChanged(const int abilityWeight)
+void Sigmodr::Widgets::SpeciesUI::on_varAbilityWeight_valueChanged(const int abilityWeight)
 {
     QListWidgetItem* item = varAbilities->selectedListWidget()->currentItem();
     qobject_cast<Sigmod::Species*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), abilityWeight);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varItems_added(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varItems_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 1);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::on_varItems_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::on_varItems_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Species*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 0);
     setGui();
 }
 
-void Sigmodr::SpeciesUI::selectedItemChanged(QListWidgetItem* item)
+void Sigmodr::Widgets::SpeciesUI::selectedItemChanged(QListWidgetItem* item)
 {
     if (item)
         varItemWeight->setValue(qobject_cast<Sigmod::Species*>(modified())->item(item->data(Qt::UserRole).toInt()));
@@ -575,7 +575,7 @@ void Sigmodr::SpeciesUI::selectedItemChanged(QListWidgetItem* item)
         varItemWeight->setEnabled(false);
 }
 
-void Sigmodr::SpeciesUI::on_varItemWeight_valueChanged(const int itemWeight)
+void Sigmodr::Widgets::SpeciesUI::on_varItemWeight_valueChanged(const int itemWeight)
 {
     QListWidgetItem* item = varItems->selectedListWidget()->currentItem();
     qobject_cast<Sigmod::Species*>(modified())->setItem(item->data(Qt::UserRole).toInt(), itemWeight);
diff --git a/sigmodr/widgets/SpriteUI.cpp b/sigmodr/widgets/SpriteUI.cpp
index 348b732f..2ed63444 100644
--- a/sigmodr/widgets/SpriteUI.cpp
+++ b/sigmodr/widgets/SpriteUI.cpp
@@ -28,23 +28,23 @@
 #include <KMessageBox>
 #include <KIO/NetAccess>
 
-Sigmodr::SpriteUI::SpriteUI(Sigmod::Sprite* sprite, QWidget* parent) :
+Sigmodr::Widgets::SpriteUI::SpriteUI(Sigmod::Sprite* sprite, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(sprite, new Sigmod::Sprite(*sprite));
 }
 
-Sigmodr::SpriteUI::~SpriteUI()
+Sigmodr::Widgets::SpriteUI::~SpriteUI()
 {
 }
 
-void Sigmodr::SpriteUI::initGui()
+void Sigmodr::Widgets::SpriteUI::initGui()
 {
     buttonBrowse->setIcon(KIcon("document-open"));
 }
 
-void Sigmodr::SpriteUI::setGui()
+void Sigmodr::Widgets::SpriteUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Sprite*>(modified())->name());
     QPixmap icon;
@@ -52,27 +52,27 @@ void Sigmodr::SpriteUI::setGui()
     varSprite->setPixmap(icon);
 }
 
-void Sigmodr::SpriteUI::apply()
+void Sigmodr::Widgets::SpriteUI::apply()
 {
     *qobject_cast<Sigmod::Sprite*>(original()) = *qobject_cast<Sigmod::Sprite*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::SpriteUI::discard()
+void Sigmodr::Widgets::SpriteUI::discard()
 {
     *qobject_cast<Sigmod::Sprite*>(modified()) = *qobject_cast<Sigmod::Sprite*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::SpriteUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::SpriteUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Sprite*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::SpriteUI::on_buttonBrowse_pressed()
+void Sigmodr::Widgets::SpriteUI::on_buttonBrowse_pressed()
 {
     KFileDialog* dialog = new KFileDialog(KUrl("kfiledialog:///image"), "image/png image/jpeg image/tiff image/bmp image/gif", this);
     dialog->setCaption("Use Image File");
diff --git a/sigmodr/widgets/StatusUI.cpp b/sigmodr/widgets/StatusUI.cpp
index cbd1f4a5..4a144b19 100644
--- a/sigmodr/widgets/StatusUI.cpp
+++ b/sigmodr/widgets/StatusUI.cpp
@@ -21,50 +21,50 @@
 // Sigmod includes
 #include <sigmod/Status.h>
 
-Sigmodr::StatusUI::StatusUI(Sigmod::Status* status, QWidget* parent) :
+Sigmodr::Widgets::StatusUI::StatusUI(Sigmod::Status* status, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(status, new Sigmod::Status(*status));
 }
 
-Sigmodr::StatusUI::~StatusUI()
+Sigmodr::Widgets::StatusUI::~StatusUI()
 {
 }
 
-void Sigmodr::StatusUI::setGui()
+void Sigmodr::Widgets::StatusUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Status*>(modified())->name());
     varBattleScript->setValue(qobject_cast<Sigmod::Status*>(modified())->battleScript());
     varWorldScript->setValue(qobject_cast<Sigmod::Status*>(modified())->worldScript());
 }
 
-void Sigmodr::StatusUI::apply()
+void Sigmodr::Widgets::StatusUI::apply()
 {
     *qobject_cast<Sigmod::Status*>(original()) = *qobject_cast<Sigmod::Status*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::StatusUI::discard()
+void Sigmodr::Widgets::StatusUI::discard()
 {
     *qobject_cast<Sigmod::Status*>(modified()) = *qobject_cast<Sigmod::Status*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::StatusUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::StatusUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Status*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::StatusUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
+void Sigmodr::Widgets::StatusUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
 {
     qobject_cast<Sigmod::Status*>(modified())->setBattleScript(battleScript);
 }
 
-void Sigmodr::StatusUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
+void Sigmodr::Widgets::StatusUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
 {
     qobject_cast<Sigmod::Status*>(modified())->setWorldScript(worldScript);
 }
diff --git a/sigmodr/widgets/StoreUI.cpp b/sigmodr/widgets/StoreUI.cpp
index f5aae74f..4b598179 100644
--- a/sigmodr/widgets/StoreUI.cpp
+++ b/sigmodr/widgets/StoreUI.cpp
@@ -26,18 +26,18 @@
 // Qt includes
 #include <QtGui/QListWidgetItem>
 
-Sigmodr::StoreUI::StoreUI(Sigmod::Store* store, QWidget* parent) :
+Sigmodr::Widgets::StoreUI::StoreUI(Sigmod::Store* store, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(store, new Sigmod::Store(*store));
 }
 
-Sigmodr::StoreUI::~StoreUI()
+Sigmodr::Widgets::StoreUI::~StoreUI()
 {
 }
 
-void Sigmodr::StoreUI::refreshGui()
+void Sigmodr::Widgets::StoreUI::refreshGui()
 {
     const bool blockedItems = varItems->blockSignals(true);
     varItems->availableListWidget()->clear();
@@ -52,7 +52,7 @@ void Sigmodr::StoreUI::refreshGui()
     varItems->setButtonsEnabled();
 }
 
-void Sigmodr::StoreUI::setGui()
+void Sigmodr::Widgets::StoreUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Store*>(modified())->name());
     for (int i = 0; i < varItems->availableListWidget()->count(); ++i)
@@ -70,33 +70,33 @@ void Sigmodr::StoreUI::setGui()
     varItems->setButtonsEnabled();
 }
 
-void Sigmodr::StoreUI::apply()
+void Sigmodr::Widgets::StoreUI::apply()
 {
     *qobject_cast<Sigmod::Store*>(original()) = *qobject_cast<Sigmod::Store*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::StoreUI::discard()
+void Sigmodr::Widgets::StoreUI::discard()
 {
     *qobject_cast<Sigmod::Store*>(modified()) = *qobject_cast<Sigmod::Store*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::StoreUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::StoreUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Store*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::StoreUI::on_varItems_added(QListWidgetItem* item)
+void Sigmodr::Widgets::StoreUI::on_varItems_added(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::StoreUI::on_varItems_removed(QListWidgetItem* item)
+void Sigmodr::Widgets::StoreUI::on_varItems_removed(QListWidgetItem* item)
 {
     qobject_cast<Sigmod::Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), false);
     setGui();
diff --git a/sigmodr/widgets/TileUI.cpp b/sigmodr/widgets/TileUI.cpp
index 4965279a..3fbd69c8 100644
--- a/sigmodr/widgets/TileUI.cpp
+++ b/sigmodr/widgets/TileUI.cpp
@@ -23,50 +23,50 @@
 #include <sigmod/Sigmod.h>
 #include <sigmod/Sprite.h>
 
-Sigmodr::TileUI::TileUI(Sigmod::Tile* tile, QWidget* parent) :
+Sigmodr::Widgets::TileUI::TileUI(Sigmod::Tile* tile, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(tile, new Sigmod::Tile(*tile));
 }
 
-Sigmodr::TileUI::~TileUI()
+Sigmodr::Widgets::TileUI::~TileUI()
 {
 }
 
-void Sigmodr::TileUI::setGui()
+void Sigmodr::Widgets::TileUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Tile*>(modified())->name());
     varWalkable->setChecked(qobject_cast<Sigmod::Tile*>(modified())->walkable());
     varScript->setValue(qobject_cast<Sigmod::Tile*>(modified())->script());
 }
 
-void Sigmodr::TileUI::apply()
+void Sigmodr::Widgets::TileUI::apply()
 {
     *qobject_cast<Sigmod::Tile*>(original()) = *qobject_cast<Sigmod::Tile*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::TileUI::discard()
+void Sigmodr::Widgets::TileUI::discard()
 {
     *qobject_cast<Sigmod::Tile*>(modified()) = *qobject_cast<Sigmod::Tile*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::TileUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::TileUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Tile*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::TileUI::on_varWalkable_toggled(const bool walkable)
+void Sigmodr::Widgets::TileUI::on_varWalkable_toggled(const bool walkable)
 {
     qobject_cast<Sigmod::Tile*>(modified())->setWalkable(walkable);
 }
 
-void Sigmodr::TileUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::TileUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::Tile*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/TimeUI.cpp b/sigmodr/widgets/TimeUI.cpp
index 82677f49..e7be20d2 100644
--- a/sigmodr/widgets/TimeUI.cpp
+++ b/sigmodr/widgets/TimeUI.cpp
@@ -21,51 +21,51 @@
 // Sigmod includes
 #include <sigmod/Time.h>
 
-Sigmodr::TimeUI::TimeUI(Sigmod::Time* time, QWidget* parent) :
+Sigmodr::Widgets::TimeUI::TimeUI(Sigmod::Time* time, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(time, new Sigmod::Time(*time));
 }
 
-Sigmodr::TimeUI::~TimeUI()
+Sigmodr::Widgets::TimeUI::~TimeUI()
 {
 }
 
-void Sigmodr::TimeUI::setGui()
+void Sigmodr::Widgets::TimeUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Time*>(modified())->name());
     varTime->setTime(QTime(qobject_cast<Sigmod::Time*>(modified())->hour(), qobject_cast<Sigmod::Time*>(modified())->minute()));
     varScript->setValue(qobject_cast<Sigmod::Time*>(modified())->script());
 }
 
-void Sigmodr::TimeUI::apply()
+void Sigmodr::Widgets::TimeUI::apply()
 {
     *qobject_cast<Sigmod::Time*>(original()) = *qobject_cast<Sigmod::Time*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::TimeUI::discard()
+void Sigmodr::Widgets::TimeUI::discard()
 {
     *qobject_cast<Sigmod::Time*>(modified()) = *qobject_cast<Sigmod::Time*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::TimeUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::TimeUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Time*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::TimeUI::on_varTime_timeChanged(const QTime& time)
+void Sigmodr::Widgets::TimeUI::on_varTime_timeChanged(const QTime& time)
 {
     qobject_cast<Sigmod::Time*>(modified())->setHour(time.hour());
     qobject_cast<Sigmod::Time*>(modified())->setMinute(time.minute());
 }
 
-void Sigmodr::TimeUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::TimeUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::Time*>(modified())->setScript(script);
 }
diff --git a/sigmodr/widgets/TrainerUI.cpp b/sigmodr/widgets/TrainerUI.cpp
index 1d2a6ad5..3da7bf02 100644
--- a/sigmodr/widgets/TrainerUI.cpp
+++ b/sigmodr/widgets/TrainerUI.cpp
@@ -24,18 +24,18 @@
 #include <sigmod/Skin.h>
 #include <sigmod/Trainer.h>
 
-Sigmodr::TrainerUI::TrainerUI(Sigmod::Trainer* trainer, QWidget* parent) :
+Sigmodr::Widgets::TrainerUI::TrainerUI(Sigmod::Trainer* trainer, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(trainer, new Sigmod::Trainer(*trainer));
 }
 
-Sigmodr::TrainerUI::~TrainerUI()
+Sigmodr::Widgets::TrainerUI::~TrainerUI()
 {
 }
 
-void Sigmodr::TrainerUI::initGui()
+void Sigmodr::Widgets::TrainerUI::initGui()
 {
     varTeamIntel->addItem(Sigmod::Trainer::IntelligenceStr[Sigmod::Trainer::Ignorant], QVariant::fromValue(Sigmod::Trainer::Ignorant));
     varTeamIntel->addItem(Sigmod::Trainer::IntelligenceStr[Sigmod::Trainer::Determine], QVariant::fromValue(Sigmod::Trainer::Determine));
@@ -59,7 +59,7 @@ void Sigmodr::TrainerUI::initGui()
     varStatIntel->addItem(Sigmod::Trainer::IntelligenceStr[Sigmod::Trainer::Cheating], QVariant::fromValue(Sigmod::Trainer::Cheating));
 }
 
-void Sigmodr::TrainerUI::refreshGui()
+void Sigmodr::Widgets::TrainerUI::refreshGui()
 {
     for (int i = 0; i < sigmod()->skinCount(); ++i)
     {
@@ -70,7 +70,7 @@ void Sigmodr::TrainerUI::refreshGui()
     varAbilityIntel->setEnabled(sigmod()->rules()->maxAbilities());
 }
 
-void Sigmodr::TrainerUI::setGui()
+void Sigmodr::Widgets::TrainerUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Trainer*>(modified())->name());
     varMoneyFactor->setValue(qobject_cast<Sigmod::Trainer*>(modified())->moneyFactor());
@@ -83,59 +83,59 @@ void Sigmodr::TrainerUI::setGui()
     varStatIntel->setCurrentIndex(qobject_cast<Sigmod::Trainer*>(modified())->statIntel());
 }
 
-void Sigmodr::TrainerUI::apply()
+void Sigmodr::Widgets::TrainerUI::apply()
 {
     *qobject_cast<Sigmod::Trainer*>(original()) = *qobject_cast<Sigmod::Trainer*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::TrainerUI::discard()
+void Sigmodr::Widgets::TrainerUI::discard()
 {
     *qobject_cast<Sigmod::Trainer*>(modified()) = *qobject_cast<Sigmod::Trainer*>(original());
     emit(changed(false));
 }
 
-void Sigmodr::TrainerUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::TrainerUI::on_varName_textChanged(const QString& name)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setName(name);
 }
 
-void Sigmodr::TrainerUI::on_varMoneyFactor_valueChanged(const int moneyFactor)
+void Sigmodr::Widgets::TrainerUI::on_varMoneyFactor_valueChanged(const int moneyFactor)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setMoneyFactor(moneyFactor);
 }
 
-void Sigmodr::TrainerUI::on_varSkin_currentIndexChanged(const int skin)
+void Sigmodr::Widgets::TrainerUI::on_varSkin_currentIndexChanged(const int skin)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setSkin(varSkin->itemData(skin).toInt());
 }
 
-void Sigmodr::TrainerUI::on_varDepth_valueChanged(const int depth)
+void Sigmodr::Widgets::TrainerUI::on_varDepth_valueChanged(const int depth)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setDepth(depth);
 }
 
-void Sigmodr::TrainerUI::on_varTeamIntel_activated(const int teamIntel)
+void Sigmodr::Widgets::TrainerUI::on_varTeamIntel_activated(const int teamIntel)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setTeamIntel(varTeamIntel->itemData(teamIntel).value<Sigmod::Trainer::Intelligence>());
 }
 
-void Sigmodr::TrainerUI::on_varMoveIntel_activated(const int moveIntel)
+void Sigmodr::Widgets::TrainerUI::on_varMoveIntel_activated(const int moveIntel)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setMoveIntel(varMoveIntel->itemData(moveIntel).value<Sigmod::Trainer::Intelligence>());
 }
 
-void Sigmodr::TrainerUI::on_varItemIntel_activated(const int itemIntel)
+void Sigmodr::Widgets::TrainerUI::on_varItemIntel_activated(const int itemIntel)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setItemIntel(varItemIntel->itemData(itemIntel).value<Sigmod::Trainer::Intelligence>());
 }
 
-void Sigmodr::TrainerUI::on_varAbilityIntel_activated(const int abilityIntel)
+void Sigmodr::Widgets::TrainerUI::on_varAbilityIntel_activated(const int abilityIntel)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setAbilityIntel(varAbilityIntel->itemData(abilityIntel).value<Sigmod::Trainer::Intelligence>());
 }
 
-void Sigmodr::TrainerUI::on_varStatIntel_activated(const int statIntel)
+void Sigmodr::Widgets::TrainerUI::on_varStatIntel_activated(const int statIntel)
 {
     qobject_cast<Sigmod::Trainer*>(modified())->setStatIntel(varStatIntel->itemData(statIntel).value<Sigmod::Trainer::Intelligence>());
 }
diff --git a/sigmodr/widgets/TypeUI.cpp b/sigmodr/widgets/TypeUI.cpp
index 0033d712..d51e34e9 100644
--- a/sigmodr/widgets/TypeUI.cpp
+++ b/sigmodr/widgets/TypeUI.cpp
@@ -21,44 +21,44 @@
 // Sigmod includes
 #include <sigmod/Type.h>
 
-Sigmodr::TypeUI::TypeUI(Sigmod::Type* type, QWidget* parent) :
+Sigmodr::Widgets::TypeUI::TypeUI(Sigmod::Type* type, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(type, new Sigmod::Type(*type));
 }
 
-Sigmodr::TypeUI::~TypeUI()
+Sigmodr::Widgets::TypeUI::~TypeUI()
 {
 }
 
-void Sigmodr::TypeUI::setGui()
+void Sigmodr::Widgets::TypeUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Type*>(modified())->name());
     varSTAB->setValue(qobject_cast<Sigmod::Type*>(modified())->stab());
 }
 
-void Sigmodr::TypeUI::apply()
+void Sigmodr::Widgets::TypeUI::apply()
 {
     *qobject_cast<Sigmod::Type*>(original()) = *qobject_cast<Sigmod::Type*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::TypeUI::discard()
+void Sigmodr::Widgets::TypeUI::discard()
 {
     *qobject_cast<Sigmod::Type*>(modified()) = *qobject_cast<Sigmod::Type*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::TypeUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::TypeUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Type*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::TypeUI::on_varSTAB_valueChanged(const Sigcore::Fraction& stab)
+void Sigmodr::Widgets::TypeUI::on_varSTAB_valueChanged(const Sigcore::Fraction& stab)
 {
     qobject_cast<Sigmod::Type*>(modified())->setStab(stab);
 }
diff --git a/sigmodr/widgets/TypechartModel.cpp b/sigmodr/widgets/TypechartModel.cpp
index b2f09fab..822cc92e 100644
--- a/sigmodr/widgets/TypechartModel.cpp
+++ b/sigmodr/widgets/TypechartModel.cpp
@@ -21,14 +21,14 @@
 // KDE includes
 #include <KColorScheme>
 
-Sigmodr::TypechartModel::TypechartModel(Sigcore::Matrix<Sigcore::Fraction>* typechart, const QStringList& types) :
+Sigmodr::Widgets::TypechartModel::TypechartModel(Sigcore::Matrix<Sigcore::Fraction>* typechart, const QStringList& types) :
         QAbstractTableModel(),
         m_typechart(*typechart),
         m_types(types)
 {
 }
 
-QVariant Sigmodr::TypechartModel::data(const QModelIndex& index, int role) const
+QVariant Sigmodr::Widgets::TypechartModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return QVariant();
@@ -49,7 +49,7 @@ QVariant Sigmodr::TypechartModel::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-QVariant Sigmodr::TypechartModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant Sigmodr::Widgets::TypechartModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     Q_UNUSED(orientation)
     if (role == Qt::DisplayRole)
@@ -57,26 +57,26 @@ QVariant Sigmodr::TypechartModel::headerData(int section, Qt::Orientation orient
     return QVariant();
 }
 
-int Sigmodr::TypechartModel::rowCount(const QModelIndex& parent) const
+int Sigmodr::Widgets::TypechartModel::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent)
     return m_typechart.height();
 }
 
-int Sigmodr::TypechartModel::columnCount(const QModelIndex& parent) const
+int Sigmodr::Widgets::TypechartModel::columnCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent)
     return m_typechart.width();
 }
 
-Qt::ItemFlags Sigmodr::TypechartModel::flags(const QModelIndex& index) const
+Qt::ItemFlags Sigmodr::Widgets::TypechartModel::flags(const QModelIndex& index) const
 {
     if (!index.isValid())
         return 0;
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
-bool Sigmodr::TypechartModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool Sigmodr::Widgets::TypechartModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     if (!index.isValid())
         return false;
@@ -92,7 +92,7 @@ bool Sigmodr::TypechartModel::setData(const QModelIndex& index, const QVariant&
     return false;
 }
 
-void Sigmodr::TypechartModel::discarded()
+void Sigmodr::Widgets::TypechartModel::discarded()
 {
     emit(reset());
 }
diff --git a/sigmodr/widgets/ValidationDialog.cpp b/sigmodr/widgets/ValidationDialog.cpp
index 84c43665..d2dcc308 100644
--- a/sigmodr/widgets/ValidationDialog.cpp
+++ b/sigmodr/widgets/ValidationDialog.cpp
@@ -31,7 +31,7 @@
 #include <QtGui/QTreeWidget>
 #include <QtGui/QVBoxLayout>
 
-Sigmodr::ValidationDialog::ValidationDialog(Sigmod::Object* object, QWidget* parent) :
+Sigmodr::Widgets::ValidationDialog::ValidationDialog(Sigmod::Object* object, QWidget* parent) :
         QWidget(parent),
         m_processed(false),
         m_object(object),
@@ -40,17 +40,17 @@ Sigmodr::ValidationDialog::ValidationDialog(Sigmod::Object* object, QWidget* par
     connect(m_object, SIGNAL(changed()), this, SLOT(objectChanged()));
 }
 
-int Sigmodr::ValidationDialog::errors() const
+int Sigmodr::Widgets::ValidationDialog::errors() const
 {
     return m_errors;
 }
 
-int Sigmodr::ValidationDialog::warnings() const
+int Sigmodr::Widgets::ValidationDialog::warnings() const
 {
     return m_warnings;
 }
 
-void Sigmodr::ValidationDialog::process()
+void Sigmodr::Widgets::ValidationDialog::process()
 {
     if (!m_processed)
     {
@@ -78,7 +78,7 @@ void Sigmodr::ValidationDialog::process()
     m_processed = true;
 }
 
-void Sigmodr::ValidationDialog::show()
+void Sigmodr::Widgets::ValidationDialog::show()
 {
     if (!m_processed)
         process();
@@ -101,14 +101,14 @@ void Sigmodr::ValidationDialog::show()
         KMessageBox::information(this, "No messages", "Validation");
 }
 
-void Sigmodr::ValidationDialog::insertMessage(const QString& msg, const QBrush& brush)
+void Sigmodr::Widgets::ValidationDialog::insertMessage(const QString& msg, const QBrush& brush)
 {
     ++m_parents.top().second;
     QTreeWidgetItem* item = new QTreeWidgetItem(m_parents.top().first, QStringList(msg));
     item->setBackground(0, brush);
 }
 
-void Sigmodr::ValidationDialog::addMessage(const QString& msg)
+void Sigmodr::Widgets::ValidationDialog::addMessage(const QString& msg)
 {
     if (msg.startsWith(QString("++")))
         m_parents.push(ObjectErrorCount(new QTreeWidgetItem(QStringList(msg.mid(2))), 0));
@@ -125,19 +125,19 @@ void Sigmodr::ValidationDialog::addMessage(const QString& msg)
         insertMessage(msg, KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground).brush(QPalette::Normal));
 }
 
-void Sigmodr::ValidationDialog::addError(const QString& msg)
+void Sigmodr::Widgets::ValidationDialog::addError(const QString& msg)
 {
     insertMessage(msg, KStatefulBrush(KColorScheme::View, KColorScheme::NegativeBackground).brush(QPalette::Normal));
     ++m_errors;
 }
 
-void Sigmodr::ValidationDialog::addWarning(const QString& msg)
+void Sigmodr::Widgets::ValidationDialog::addWarning(const QString& msg)
 {
     insertMessage(msg, KStatefulBrush(KColorScheme::View, KColorScheme::NeutralBackground).brush(QPalette::Normal));
     ++m_warnings;
 }
 
-void Sigmodr::ValidationDialog::objectChanged()
+void Sigmodr::Widgets::ValidationDialog::objectChanged()
 {
     m_processed = false;
 }
diff --git a/sigmodr/widgets/WeatherUI.cpp b/sigmodr/widgets/WeatherUI.cpp
index 294f88d6..1b03281f 100644
--- a/sigmodr/widgets/WeatherUI.cpp
+++ b/sigmodr/widgets/WeatherUI.cpp
@@ -21,44 +21,44 @@
 // Sigmod includes
 #include <sigmod/Weather.h>
 
-Sigmodr::WeatherUI::WeatherUI(Sigmod::Weather* weather, QWidget* parent) :
+Sigmodr::Widgets::WeatherUI::WeatherUI(Sigmod::Weather* weather, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(weather, new Sigmod::Weather(*weather));
 }
 
-Sigmodr::WeatherUI::~WeatherUI()
+Sigmodr::Widgets::WeatherUI::~WeatherUI()
 {
 }
 
-void Sigmodr::WeatherUI::setGui()
+void Sigmodr::Widgets::WeatherUI::setGui()
 {
     varName->setText(qobject_cast<Sigmod::Weather*>(modified())->name());
     varScript->setValue(qobject_cast<Sigmod::Weather*>(modified())->script());
 }
 
-void Sigmodr::WeatherUI::apply()
+void Sigmodr::Widgets::WeatherUI::apply()
 {
     *qobject_cast<Sigmod::Weather*>(original()) = *qobject_cast<Sigmod::Weather*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::WeatherUI::discard()
+void Sigmodr::Widgets::WeatherUI::discard()
 {
     *qobject_cast<Sigmod::Weather*>(modified()) = *qobject_cast<Sigmod::Weather*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::WeatherUI::on_varName_textChanged(const QString& name)
+void Sigmodr::Widgets::WeatherUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
     qobject_cast<Sigmod::Weather*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::WeatherUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void Sigmodr::Widgets::WeatherUI::on_varScript_valueChanged(const Sigcore::Script& script)
 {
     qobject_cast<Sigmod::Weather*>(modified())->setScript(script);
 }