Add using namespace Sigmod and Sigcore to sigmod sources for cleaner code

35 files changed, 536 insertions, 448 deletions

diff --git a/sigmod/Ability.cpp b/sigmod/Ability.cpp
index 6a0bbf55..b42231a5 100644
--- a/sigmod/Ability.cpp
+++ b/sigmod/Ability.cpp
@@ -26,13 +26,16 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Ability::Ability(const Ability& ability) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Ability::Ability(const Ability& ability) :
         Object(ability.parent(), ability.id())
 {
     *this = ability;
 }
 
-Sigmod::Ability::Ability(const Sigmod* parent, const int id) :
+Ability::Ability(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_priority(0),
@@ -43,20 +46,20 @@ Sigmod::Ability::Ability(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Ability::Ability(const Ability& ability, const Sigmod* parent, const int id) :
+Ability::Ability(const Ability& ability, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = ability;
 }
 
-Sigmod::Ability::Ability(const QDomElement& xml, const Sigmod* parent, const int id) :
+Ability::Ability(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Ability::validate()
+void Ability::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -64,7 +67,7 @@ void Sigmod::Ability::validate()
     TEST_END();
 }
 
-void Sigmod::Ability::load(const QDomElement& xml)
+void Ability::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -75,7 +78,7 @@ void Sigmod::Ability::load(const QDomElement& xml)
     LOAD(priorityScript);
 }
 
-QDomElement Sigmod::Ability::save() const
+QDomElement Ability::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -90,25 +93,25 @@ QDomElement Sigmod::Ability::save() const
 SETTER(Ability, QString&, Name, name)
 SETTER(Ability, int, Priority, priority)
 SETTER(Ability, QString&, Description, description)
-SETTER(Ability, Sigcore::Script&, BattleScript, battleScript)
-SETTER(Ability, Sigcore::Script&, WorldScript, worldScript)
-SETTER(Ability, Sigcore::Script&, PriorityScript, priorityScript)
+SETTER(Ability, Script&, BattleScript, battleScript)
+SETTER(Ability, Script&, WorldScript, worldScript)
+SETTER(Ability, Script&, PriorityScript, priorityScript)
 
 GETTER(Ability, QString, name)
 GETTER(Ability, int, priority)
 GETTER(Ability, QString, description)
-GETTER(Ability, Sigcore::Script, battleScript)
-GETTER(Ability, Sigcore::Script, worldScript)
-GETTER(Ability, Sigcore::Script, priorityScript)
+GETTER(Ability, Script, battleScript)
+GETTER(Ability, Script, worldScript)
+GETTER(Ability, Script, priorityScript)
 
 CHECK(Ability, QString&, name)
 CHECK(Ability, int, priority)
 CHECK(Ability, QString&, description)
-CHECK(Ability, Sigcore::Script&, battleScript)
-CHECK(Ability, Sigcore::Script&, worldScript)
-CHECK(Ability, Sigcore::Script&, priorityScript)
+CHECK(Ability, Script&, battleScript)
+CHECK(Ability, Script&, worldScript)
+CHECK(Ability, Script&, priorityScript)
 
-Sigmod::Ability& Sigmod::Ability::operator=(const Ability& rhs)
+Ability& Ability::operator=(const Ability& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Author.cpp b/sigmod/Author.cpp
index 34fb3b9f..9cccdf90 100644
--- a/sigmod/Author.cpp
+++ b/sigmod/Author.cpp
@@ -29,13 +29,15 @@
 // Qt includes
 #include <QtCore/QRegExp>
 
-Sigmod::Author::Author(const Author& author) :
+using namespace Sigmod;
+
+Author::Author(const Author& author) :
         Object(author.parent(), author.id())
 {
     *this = author;
 }
 
-Sigmod::Author::Author(const Sigmod* parent, const int id) :
+Author::Author(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_email(""),
@@ -43,20 +45,20 @@ Sigmod::Author::Author(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Author::Author(const Author& author, const Sigmod* parent, const int id) :
+Author::Author(const Author& author, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = author;
 }
 
-Sigmod::Author::Author(const QDomElement& xml, const Sigmod* parent, const int id) :
+Author::Author(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Author::validate()
+void Author::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -70,7 +72,7 @@ void Sigmod::Author::validate()
     TEST_END();
 }
 
-void Sigmod::Author::load(const QDomElement& xml)
+void Author::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -78,7 +80,7 @@ void Sigmod::Author::load(const QDomElement& xml)
     LOAD(role);
 }
 
-QDomElement Sigmod::Author::save() const
+QDomElement Author::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -99,7 +101,7 @@ CHECK(Author, QString&, name)
 CHECK(Author, QString&, email)
 CHECK(Author, QString&, role)
 
-Sigmod::Author& Sigmod::Author::operator=(const Author& rhs)
+Author& Author::operator=(const Author& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Badge.cpp b/sigmod/Badge.cpp
index 1fec4bee..14b08ed9 100644
--- a/sigmod/Badge.cpp
+++ b/sigmod/Badge.cpp
@@ -28,14 +28,17 @@
 #include "Sigmod.h"
 #include "Sprite.h"
 
-Sigmod::Badge::Badge(const Badge& badge) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Badge::Badge(const Badge& badge) :
         Object(badge.parent(), badge.id()),
         m_stat(ST_SpecialDefense - ST_Attack + 1)
 {
     *this = badge;
 }
 
-Sigmod::Badge::Badge(const Sigmod* parent, const int id) :
+Badge::Badge(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_face(-1),
@@ -47,14 +50,14 @@ Sigmod::Badge::Badge(const Sigmod* parent, const int id) :
         m_stat[i].set(1, 1);
 }
 
-Sigmod::Badge::Badge(const Badge& badge, const Sigmod* parent, const int id) :
+Badge::Badge(const Badge& badge, const Sigmod* parent, const int id) :
         Object(parent, id),
         m_stat(ST_SpecialDefense - ST_Attack + 1)
 {
     *this = badge;
 }
 
-Sigmod::Badge::Badge(const QDomElement& xml, const Sigmod* parent, const int id) :
+Badge::Badge(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id),
         m_stat(ST_SpecialDefense - ST_Attack + 1)
 {
@@ -62,7 +65,7 @@ Sigmod::Badge::Badge(const QDomElement& xml, const Sigmod* parent, const int id)
     load(xml);
 }
 
-void Sigmod::Badge::validate()
+void Badge::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -85,7 +88,7 @@ void Sigmod::Badge::validate()
     TEST_END();
 }
 
-void Sigmod::Badge::load(const QDomElement& xml)
+void Badge::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -95,7 +98,7 @@ void Sigmod::Badge::load(const QDomElement& xml)
     LOAD_ARRAY(stat);
 }
 
-QDomElement Sigmod::Badge::save() const
+QDomElement Badge::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -110,19 +113,19 @@ SETTER(Badge, QString&, Name, name)
 SETTER(Badge, int, Face, face)
 SETTER(Badge, int, Badge, badge)
 SETTER(Badge, int, Obey, obey)
-SETTER_ARRAY(Badge, Sigcore::Fraction&, Stat, stat, multiplier, Stat, stat, ST_Attack)
+SETTER_ARRAY(Badge, Fraction&, Stat, stat, multiplier, Stat, stat, ST_Attack)
 
 GETTER(Badge, QString, name)
 GETTER(Badge, int, face)
 GETTER(Badge, int, badge)
 GETTER(Badge, int, obey)
-GETTER_ARRAY(Badge, Sigcore::Fraction, stat, multiplier, Stat, stat, ST_Attack)
+GETTER_ARRAY(Badge, Fraction, stat, multiplier, Stat, stat, ST_Attack)
 
 CHECK(Badge, QString&, name)
 CHECK_INDEX(Badge, int, face, sigmod(), sprite)
 CHECK_INDEX(Badge, int, badge, sigmod(), sprite)
 CHECK_BOUNDS(Badge, int, obey, INT_MIN, sigmod()->rules()->maxLevel())
-CHECK_BEGIN_ARRAY(Badge, Sigcore::Fraction&, stat, multiplier, Stat, stat)
+CHECK_BEGIN_ARRAY(Badge, Fraction&, stat, multiplier, Stat, stat)
     switch (stat)
     {
         case ST_SpecialDefense:
@@ -139,7 +142,7 @@ CHECK_BEGIN_ARRAY(Badge, Sigcore::Fraction&, stat, multiplier, Stat, stat)
     TBOUNDS(multiplier, 1, INT_MAX)
 CHECK_END()
 
-Sigmod::Badge& Sigmod::Badge::operator=(const Badge& rhs)
+Badge& Badge::operator=(const Badge& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/CoinList.cpp b/sigmod/CoinList.cpp
index a8fd4f2f..45a84071 100644
--- a/sigmod/CoinList.cpp
+++ b/sigmod/CoinList.cpp
@@ -30,38 +30,41 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::CoinList::CoinList(const CoinList& coinList) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+CoinList::CoinList(const CoinList& coinList) :
         Object(coinList.parent(), coinList.id())
 {
     *this = coinList;
 }
 
-Sigmod::CoinList::CoinList(const Sigmod* parent, const int id) :
+CoinList::CoinList(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_script("", "")
 {
 }
 
-Sigmod::CoinList::CoinList(const CoinList& coinList, const Sigmod* parent, const int id) :
+CoinList::CoinList(const CoinList& coinList, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = coinList;
 }
 
-Sigmod::CoinList::CoinList(const QDomElement& xml, const Sigmod* parent, const int id) :
+CoinList::CoinList(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-Sigmod::CoinList::~CoinList()
+CoinList::~CoinList()
 {
     clear();
 }
 
-void Sigmod::CoinList::validate()
+void CoinList::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -85,7 +88,7 @@ void Sigmod::CoinList::validate()
     TEST_END();
 }
 
-void Sigmod::CoinList::load(const QDomElement& xml)
+void CoinList::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -93,7 +96,7 @@ void Sigmod::CoinList::load(const QDomElement& xml)
     LOAD_SUB(newItem, CoinListItem);
 }
 
-QDomElement Sigmod::CoinList::save() const
+QDomElement CoinList::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -103,17 +106,17 @@ QDomElement Sigmod::CoinList::save() const
 }
 
 SETTER(CoinList, QString&, Name, name)
-SETTER(CoinList, Sigcore::Script&, Script, script)
+SETTER(CoinList, Script&, Script, script)
 
 GETTER(CoinList, QString, name)
-GETTER(CoinList, Sigcore::Script, script)
+GETTER(CoinList, Script, script)
 
 CHECK(CoinList, QString&, name)
-CHECK(CoinList, Sigcore::Script&, script)
+CHECK(CoinList, Script&, script)
 
 SUBCLASS(CoinList, Item, item, items)
 
-Sigmod::CoinList& Sigmod::CoinList::operator=(const CoinList& rhs)
+CoinList& CoinList::operator=(const CoinList& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -124,7 +127,7 @@ Sigmod::CoinList& Sigmod::CoinList::operator=(const CoinList& rhs)
     return *this;
 }
 
-void Sigmod::CoinList::clear()
+void CoinList::clear()
 {
     SUBCLASS_CLEAR(items);
 }
diff --git a/sigmod/CoinListItem.cpp b/sigmod/CoinListItem.cpp
index d9b50228..16c68067 100644
--- a/sigmod/CoinListItem.cpp
+++ b/sigmod/CoinListItem.cpp
@@ -27,15 +27,17 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-const QStringList Sigmod::CoinListItem::TypeStr = QStringList() << "Item" << "Team Member";
+using namespace Sigmod;
 
-Sigmod::CoinListItem::CoinListItem(const CoinListItem& item) :
+const QStringList CoinListItem::TypeStr = QStringList() << "Item" << "Team Member";
+
+CoinListItem::CoinListItem(const CoinListItem& item) :
         Object(item.parent(), item.id())
 {
     *this = item;
 }
 
-Sigmod::CoinListItem::CoinListItem(const CoinList* parent, const int id) :
+CoinListItem::CoinListItem(const CoinList* parent, const int id) :
         Object(parent, id),
         m_type(Item),
         m_object(-1),
@@ -43,20 +45,20 @@ Sigmod::CoinListItem::CoinListItem(const CoinList* parent, const int id) :
 {
 }
 
-Sigmod::CoinListItem::CoinListItem(const CoinListItem& item, const CoinList* parent, const int id) :
+CoinListItem::CoinListItem(const CoinListItem& item, const CoinList* parent, const int id) :
         Object(parent, id)
 {
     *this = item;
 }
 
-Sigmod::CoinListItem::CoinListItem(const QDomElement& xml, const CoinList* parent, const int id) :
+CoinListItem::CoinListItem(const QDomElement& xml, const CoinList* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::CoinListItem::validate()
+void CoinListItem::validate()
 {
     TEST_BEGIN();
     TEST(object);
@@ -64,7 +66,7 @@ void Sigmod::CoinListItem::validate()
     TEST_END();
 }
 
-void Sigmod::CoinListItem::load(const QDomElement& xml)
+void CoinListItem::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD_ENUM(type, Type);
@@ -72,7 +74,7 @@ void Sigmod::CoinListItem::load(const QDomElement& xml)
     LOAD(cost);
 }
 
-QDomElement Sigmod::CoinListItem::save() const
+QDomElement CoinListItem::save() const
 {
     SAVE_CREATE();
     SAVE_ENUM(type, Type);
@@ -85,7 +87,7 @@ SETTER(CoinListItem, Type, Type, type)
 SETTER(CoinListItem, int, Object, object)
 SETTER(CoinListItem, int, Cost, cost)
 
-GETTER(CoinListItem, Sigmod::CoinListItem::Type, type)
+GETTER(CoinListItem, CoinListItem::Type, type)
 GETTER(CoinListItem, int, object)
 GETTER(CoinListItem, int, cost)
 
@@ -103,7 +105,7 @@ CHECK_BEGIN(CoinListItem, int, object)
 CHECK_END()
 CHECK_BOUNDS(CoinListItem, int, cost, 1, INT_MAX)
 
-Sigmod::CoinListItem& Sigmod::CoinListItem::operator=(const CoinListItem& rhs)
+CoinListItem& CoinListItem::operator=(const CoinListItem& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/EggGroup.cpp b/sigmod/EggGroup.cpp
index b829ea81..d57d980f 100644
--- a/sigmod/EggGroup.cpp
+++ b/sigmod/EggGroup.cpp
@@ -26,32 +26,34 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::EggGroup::EggGroup(const EggGroup& eggGroup) :
+using namespace Sigmod;
+
+EggGroup::EggGroup(const EggGroup& eggGroup) :
         Object(eggGroup.parent(), eggGroup.id())
 {
     *this = eggGroup;
 }
 
-Sigmod::EggGroup::EggGroup(const Sigmod* parent, const int id) :
+EggGroup::EggGroup(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name("")
 {
 }
 
-Sigmod::EggGroup::EggGroup(const EggGroup& eggGroup, const Sigmod* parent, const int id) :
+EggGroup::EggGroup(const EggGroup& eggGroup, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = eggGroup;
 }
 
-Sigmod::EggGroup::EggGroup(const QDomElement& xml, const Sigmod* parent, const int id) :
+EggGroup::EggGroup(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::EggGroup::validate()
+void EggGroup::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -59,13 +61,13 @@ void Sigmod::EggGroup::validate()
     TEST_END();
 }
 
-void Sigmod::EggGroup::load(const QDomElement& xml)
+void EggGroup::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
 }
 
-QDomElement Sigmod::EggGroup::save() const
+QDomElement EggGroup::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -78,7 +80,7 @@ GETTER(EggGroup, QString, name)
 
 CHECK(EggGroup, QString&, name)
 
-Sigmod::EggGroup& Sigmod::EggGroup::operator=(const EggGroup& rhs)
+EggGroup& EggGroup::operator=(const EggGroup& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp
index a7d9efcf..c25239f5 100644
--- a/sigmod/GlobalScript.cpp
+++ b/sigmod/GlobalScript.cpp
@@ -26,33 +26,36 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::GlobalScript::GlobalScript(const GlobalScript& globalScript) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+GlobalScript::GlobalScript(const GlobalScript& globalScript) :
         Object(globalScript.parent(), globalScript.id())
 {
     *this = globalScript;
 }
 
-Sigmod::GlobalScript::GlobalScript(const Sigmod* parent, const int id) :
+GlobalScript::GlobalScript(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_script("", "")
 {
 }
 
-Sigmod::GlobalScript::GlobalScript(const GlobalScript& globalScript, const Sigmod* parent, const int id) :
+GlobalScript::GlobalScript(const GlobalScript& globalScript, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = globalScript;
 }
 
-Sigmod::GlobalScript::GlobalScript(const QDomElement& xml, const Sigmod* parent, const int id) :
+GlobalScript::GlobalScript(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::GlobalScript::validate()
+void GlobalScript::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -60,14 +63,14 @@ void Sigmod::GlobalScript::validate()
     TEST_END();
 }
 
-void Sigmod::GlobalScript::load(const QDomElement& xml)
+void GlobalScript::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD(script);
 }
 
-QDomElement Sigmod::GlobalScript::save() const
+QDomElement GlobalScript::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -76,15 +79,15 @@ QDomElement Sigmod::GlobalScript::save() const
 }
 
 SETTER(GlobalScript, QString&, Name, name)
-SETTER(GlobalScript, Sigcore::Script&, Script, script)
+SETTER(GlobalScript, Script&, Script, script)
 
 GETTER(GlobalScript, QString, name)
-GETTER(GlobalScript, Sigcore::Script, script)
+GETTER(GlobalScript, Script, script)
 
 CHECK(GlobalScript, QString&, name)
-CHECK(GlobalScript, Sigcore::Script&, script)
+CHECK(GlobalScript, Script&, script)
 
-Sigmod::GlobalScript& Sigmod::GlobalScript::operator=(const GlobalScript& rhs)
+GlobalScript& GlobalScript::operator=(const GlobalScript& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Item.cpp b/sigmod/Item.cpp
index 0ac9f360..3942a53f 100644
--- a/sigmod/Item.cpp
+++ b/sigmod/Item.cpp
@@ -31,13 +31,16 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::Item::Item(const Item& item) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Item::Item(const Item& item) :
         Object(item.parent(), item.id())
 {
     *this = item;
 }
 
-Sigmod::Item::Item(const Sigmod* parent, const int id) :
+Item::Item(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_sellable(false),
@@ -50,20 +53,20 @@ Sigmod::Item::Item(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Item::Item(const Item& item, const Sigmod* parent, const int id) :
+Item::Item(const Item& item, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = item;
 }
 
-Sigmod::Item::Item(const QDomElement& xml, const Sigmod* parent, const int id) :
+Item::Item(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Item::validate()
+void Item::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -76,7 +79,7 @@ void Sigmod::Item::validate()
     TEST_END();
 }
 
-void Sigmod::Item::load(const QDomElement& xml)
+void Item::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -89,7 +92,7 @@ void Sigmod::Item::load(const QDomElement& xml)
     LOAD(script);
 }
 
-QDomElement Sigmod::Item::save() const
+QDomElement Item::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -110,7 +113,7 @@ SETTER(Item, int, Price, price)
 SETTER(Item, int, SellPrice, sellPrice)
 SETTER(Item, int, Weight, weight)
 SETTER(Item, QString&, Description, description)
-SETTER(Item, Sigcore::Script&, Script, script)
+SETTER(Item, Script&, Script, script)
 
 GETTER(Item, QString, name)
 GETTER(Item, bool, sellable)
@@ -119,7 +122,7 @@ GETTER(Item, int, price)
 GETTER(Item, int, sellPrice)
 GETTER(Item, int, weight)
 GETTER(Item, QString, description)
-GETTER(Item, Sigcore::Script, script)
+GETTER(Item, Script, script)
 
 CHECK(Item, QString&, name)
 CHECK(Item, bool, sellable)
@@ -132,9 +135,9 @@ CHECK_BEGIN(Item, int, weight)
         TBOUNDS(weight, 0, type->maxWeight())
 CHECK_END()
 CHECK(Item, QString&, description)
-CHECK(Item, Sigcore::Script&, script)
+CHECK(Item, Script&, script)
 
-Sigmod::Item& Sigmod::Item::operator=(const Item& rhs)
+Item& Item::operator=(const Item& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/ItemType.cpp b/sigmod/ItemType.cpp
index 58432dc4..f537f06e 100644
--- a/sigmod/ItemType.cpp
+++ b/sigmod/ItemType.cpp
@@ -27,15 +27,17 @@
 #include "Rules.h"
 #include "Sigmod.h"
 
-QStringList Sigmod::ItemType::CountStr = QStringList() << "Distinct" << "Total" << "Weight";
+using namespace Sigmod;
 
-Sigmod::ItemType::ItemType(const ItemType& itemType) :
+QStringList ItemType::CountStr = QStringList() << "Distinct" << "Total" << "Weight";
+
+ItemType::ItemType(const ItemType& itemType) :
         Object(itemType.parent(), itemType.id())
 {
     *this = itemType;
 }
 
-Sigmod::ItemType::ItemType(const Sigmod* parent, const int id) :
+ItemType::ItemType(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_computer(0),
@@ -45,20 +47,20 @@ Sigmod::ItemType::ItemType(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::ItemType::ItemType(const ItemType& itemType, const Sigmod* parent, const int id) :
+ItemType::ItemType(const ItemType& itemType, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = itemType;
 }
 
-Sigmod::ItemType::ItemType(const QDomElement& xml, const Sigmod* parent, const int id) :
+ItemType::ItemType(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::ItemType::validate()
+void ItemType::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -69,7 +71,7 @@ void Sigmod::ItemType::validate()
     TEST_END();
 }
 
-void Sigmod::ItemType::load(const QDomElement& xml)
+void ItemType::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -79,7 +81,7 @@ void Sigmod::ItemType::load(const QDomElement& xml)
     LOAD_ENUM(count, Count);
 }
 
-QDomElement Sigmod::ItemType::save() const
+QDomElement ItemType::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -100,7 +102,7 @@ GETTER(ItemType, QString, name)
 GETTER(ItemType, int, computer)
 GETTER(ItemType, int, player)
 GETTER(ItemType, int, maxWeight)
-GETTER(ItemType, Sigmod::ItemType::Count, count)
+GETTER(ItemType, ItemType::Count, count)
 
 CHECK(ItemType, QString&, name)
 CHECK_BOUNDS(ItemType, int, computer, -1, INT_MAX)
@@ -108,7 +110,7 @@ CHECK_BOUNDS(ItemType, int, player, 0, INT_MAX)
 CHECK_BOUNDS(ItemType, int, maxWeight, -1, (sigmod()->rules()->maxTotalWeight() == -1) ? INT_MAX : sigmod()->rules()->maxTotalWeight())
 CHECK(ItemType, Count, count)
 
-Sigmod::ItemType& Sigmod::ItemType::operator=(const ItemType& rhs)
+ItemType& ItemType::operator=(const ItemType& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Macros.h b/sigmod/Macros.h
index 53a27d8b..20148c27 100644
--- a/sigmod/Macros.h
+++ b/sigmod/Macros.h
@@ -180,32 +180,32 @@
     }
 
 #define SETTER(class, type, capital, variable) \
-void Sigmod::class::set##capital(const type variable) \
+void class::set##capital(const type variable) \
 { \
     TS(variable); \
 }
 #define SETTER_ARRAY(class, type, capital, variable, valueName, indexType, indexName, offset) \
-void Sigmod::class::set##capital(const indexType indexName, const type valueName) \
+void class::set##capital(const indexType indexName, const type valueName) \
 { \
     TS_ARRAY(variable, indexName, offset, valueName); \
 }
 #define SETTER_MATRIX(class, type, capital, variable, valueName) \
-void Sigmod::class::set##capital(const int row, const int column, const type valueName) \
+void class::set##capital(const int row, const int column, const type valueName) \
 { \
     TS_MATRIX(variable, row, column, valueName); \
 }
 #define SETTER_LIST(class, capital, variable) \
-void Sigmod::class::set##capital(const int variable, const bool state) \
+void class::set##capital(const int variable, const bool state) \
 { \
     TS_LIST(variable); \
 }
 #define SETTER_LIST_LIMIT(class, capital, variable, limit, limitError) \
-void Sigmod::class::set##capital(const int variable, const bool state) \
+void class::set##capital(const int variable, const bool state) \
 { \
     TS_LIST_LIMIT(variable, limit, limitError); \
 }
 #define SETTER_MAP(class, capital, variable, valueName) \
-void Sigmod::class::set##capital(const int variable, const int valueName) \
+void class::set##capital(const int variable, const int valueName) \
 { \
     if (valueName && variable##Check(variable, valueName) && (!m_##variable.contains(variable) || (valueName != m_##variable[variable]))) \
     { \
@@ -220,45 +220,45 @@ void Sigmod::class::set##capital(const int variable, const int valueName) \
 }
 
 #define GETTER(class, type, variable) \
-type Sigmod::class::variable() const \
+type class::variable() const \
 { \
     return m_##variable; \
 }
 #define GETTER_ARRAY(class, type, variable, valueName, indexType, indexName, offset) \
-type Sigmod::class::variable(const indexType indexName) const \
+type class::variable(const indexType indexName) const \
 { \
     if (variable##Check(indexName, m_##variable[indexName - offset])) \
         return m_##variable[indexName - offset]; \
     return type(); \
 }
 #define GETTER_LIST(class, variable) \
-bool Sigmod::class::variable(const int variable) const \
+bool class::variable(const int variable) const \
 { \
     return m_##variable.contains(variable); \
 } \
  \
-QList<int> Sigmod::class::variable() const \
+QList<int> class::variable() const \
 { \
     return m_##variable; \
 }
 #define GETTER_MAP(class, variable) \
-int Sigmod::class::variable(const int variable) const \
+int class::variable(const int variable) const \
 { \
     if (m_##variable.contains(variable)) \
         return m_##variable[variable]; \
     return int(); \
 } \
  \
-QMap<int, int> Sigmod::class::variable() const \
+QMap<int, int> class::variable() const \
 { \
     return m_##variable; \
 }
 
 #define CHECK_BEGIN(class, type, variable) \
-bool Sigmod::class::variable##Check(const type variable) const \
+bool class::variable##Check(const type variable) const \
 {
 #define CHECK_BEGIN_ARRAY(class, type, variable, valueName, indexType, indexName) \
-bool Sigmod::class::variable##Check(const indexType indexName, const type valueName) const \
+bool class::variable##Check(const indexType indexName, const type valueName) const \
 {
 #define CHECK_END() \
     return true; \
@@ -277,31 +277,31 @@ CHECK_BEGIN(class, type, variable) \
 CHECK_END()
 
 #define SUBCLASS_RAW(class, subclass, capital, short, variable) \
-const Sigmod::subclass* Sigmod::class::short(const int index) const \
+const subclass* class::short(const int index) const \
 { \
     if (index < short##Count()) \
         return m_##variable.at(index); \
     return NULL; \
 } \
  \
-Sigmod::subclass* Sigmod::class::short(const int index) \
+subclass* class::short(const int index) \
 { \
     if (index < short##Count()) \
         return m_##variable[index]; \
     return NULL; \
 } \
  \
-const Sigmod::subclass* Sigmod::class::short##ById(const int id) const \
+const subclass* class::short##ById(const int id) const \
 { \
     return short(short##Index(id)); \
 } \
  \
-Sigmod::subclass* Sigmod::class::short##ById(const int id) \
+subclass* class::short##ById(const int id) \
 { \
     return short(short##Index(id)); \
 } \
  \
-int Sigmod::class::short##Index(const int id) const \
+int class::short##Index(const int id) const \
 { \
     for (int i = 0; i < short##Count(); ++i) \
     { \
@@ -311,33 +311,33 @@ int Sigmod::class::short##Index(const int id) const \
     return INT_MAX; \
 } \
  \
-int Sigmod::class::short##Count() const \
+int class::short##Count() const \
 { \
     return m_##variable.size(); \
 } \
  \
-Sigmod::subclass* Sigmod::class::new##capital() \
+subclass* class::new##capital() \
 { \
     return new##capital(new subclass(this, new##capital##Id())); \
 } \
  \
-Sigmod::subclass* Sigmod::class::new##capital(const QDomElement& xml) \
+subclass* class::new##capital(const QDomElement& xml) \
 { \
     return new##capital(new subclass(xml, this, new##capital##Id())); \
 } \
  \
-Sigmod::subclass* Sigmod::class::new##capital(const subclass& short) \
+subclass* class::new##capital(const subclass& short) \
 { \
     return new##capital(new subclass(short, this, new##capital##Id())); \
 } \
  \
-Sigmod::subclass* Sigmod::class::new##capital(subclass* short) \
+subclass* class::new##capital(subclass* short) \
 { \
     m_##variable.append(short); \
     return short; \
 } \
  \
-void Sigmod::class::delete##capital(const int index) \
+void class::delete##capital(const int index) \
 { \
     if (index < short##Count()) \
     { \
@@ -346,12 +346,12 @@ void Sigmod::class::delete##capital(const int index) \
     } \
 } \
  \
-void Sigmod::class::delete##capital##ById(const int id) \
+void class::delete##capital##ById(const int id) \
 { \
     delete##capital(short##Index(id)); \
 } \
  \
-int Sigmod::class::new##capital##Id() const \
+int class::new##capital##Id() const \
 { \
     int i = 0; \
     while ((i < short##Count()) && (short##Index(i) != INT_MAX)) \
diff --git a/sigmod/Map.cpp b/sigmod/Map.cpp
index 8f61587b..53f6a530 100644
--- a/sigmod/Map.cpp
+++ b/sigmod/Map.cpp
@@ -30,15 +30,17 @@
 // Qt includes
 #include <QtCore/QSet>
 
-const QStringList Sigmod::Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building";
+using namespace Sigmod;
 
-Sigmod::Map::Map(const Map& map) :
+const QStringList Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building";
+
+Map::Map(const Map& map) :
         Object(map.parent(), map.id())
 {
     *this = map;
 }
 
-Sigmod::Map::Map(const Sigmod* parent, const int id) :
+Map::Map(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_type(Outdoor),
@@ -47,25 +49,25 @@ Sigmod::Map::Map(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Map::Map(const Map& map, const Sigmod* parent, const int id) :
+Map::Map(const Map& map, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = map;
 }
 
-Sigmod::Map::Map(const QDomElement& xml, const Sigmod* parent, const int id) :
+Map::Map(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-Sigmod::Map::~Map()
+Map::~Map()
 {
     clear();
 }
 
-void Sigmod::Map::validate()
+void Map::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -111,7 +113,7 @@ void Sigmod::Map::validate()
     TEST_END();
 }
 
-void Sigmod::Map::load(const QDomElement& xml)
+void Map::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -125,7 +127,7 @@ void Sigmod::Map::load(const QDomElement& xml)
     LOAD_SUB(newWildList, MapWildList);
 }
 
-QDomElement Sigmod::Map::save() const
+QDomElement Map::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -146,7 +148,7 @@ SETTER(Map, int, Width, width)
 SETTER(Map, int, Height, height)
 
 GETTER(Map, QString, name)
-GETTER(Map, Sigmod::Map::Type, type)
+GETTER(Map, Map::Type, type)
 GETTER(Map, int, width)
 GETTER(Map, int, height)
 
@@ -161,7 +163,7 @@ SUBCLASS(Map, Trainer, trainer, trainers)
 SUBCLASS(Map, Warp, warp, warps)
 SUBCLASS(Map, WildList, wildList, wildLists)
 
-Sigmod::Map& Sigmod::Map::operator=(const Map& rhs)
+Map& Map::operator=(const Map& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -178,7 +180,7 @@ Sigmod::Map& Sigmod::Map::operator=(const Map& rhs)
     return *this;
 }
 
-void Sigmod::Map::clear()
+void Map::clear()
 {
     SUBCLASS_CLEAR(effects);
     SUBCLASS_CLEAR(tiles);
diff --git a/sigmod/MapEffect.cpp b/sigmod/MapEffect.cpp
index 6eb75d62..3a4fe85e 100644
--- a/sigmod/MapEffect.cpp
+++ b/sigmod/MapEffect.cpp
@@ -27,13 +27,16 @@
 #include "Map.h"
 #include "Sigmod.h"
 
-Sigmod::MapEffect::MapEffect(const MapEffect& effect) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+MapEffect::MapEffect(const MapEffect& effect) :
         Object(effect.parent(), effect.id())
 {
     *this = effect;
 }
 
-Sigmod::MapEffect::MapEffect(const Map* parent, const int id) :
+MapEffect::MapEffect(const Map* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_position(0, 0),
@@ -43,20 +46,20 @@ Sigmod::MapEffect::MapEffect(const Map* parent, const int id) :
 {
 }
 
-Sigmod::MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) :
+MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) :
         Object(parent, id)
 {
     *this = effect;
 }
 
-Sigmod::MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) :
+MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::MapEffect::validate()
+void MapEffect::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -66,7 +69,7 @@ void Sigmod::MapEffect::validate()
     TEST_END();
 }
 
-void Sigmod::MapEffect::load(const QDomElement& xml)
+void MapEffect::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -76,7 +79,7 @@ void Sigmod::MapEffect::load(const QDomElement& xml)
     LOAD(script);
 }
 
-QDomElement Sigmod::MapEffect::save() const
+QDomElement MapEffect::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -91,13 +94,13 @@ SETTER(MapEffect, QString&, Name, name)
 SETTER(MapEffect, QPoint&, Position, position)
 SETTER(MapEffect, int, Skin, skin)
 SETTER(MapEffect, bool, IsGhost, isGhost)
-SETTER(MapEffect, Sigcore::Script&, Script, script)
+SETTER(MapEffect, Script&, Script, script)
 
 GETTER(MapEffect, QString, name)
 GETTER(MapEffect, QPoint, position)
 GETTER(MapEffect, int, skin)
 GETTER(MapEffect, bool, isGhost)
-GETTER(MapEffect, Sigcore::Script, script)
+GETTER(MapEffect, Script, script)
 
 CHECK(MapEffect, QString&, name)
 CHECK_BEGIN(MapEffect, QPoint&, position)
@@ -107,9 +110,9 @@ CHECK_BEGIN(MapEffect, QPoint&, position)
 CHECK_END()
 CHECK_INDEX(MapEffect, int, skin, sigmod(), skin)
 CHECK(MapEffect, bool, isGhost)
-CHECK(MapEffect, Sigcore::Script&, script)
+CHECK(MapEffect, Script&, script)
 
-Sigmod::MapEffect& Sigmod::MapEffect::operator=(const MapEffect& rhs)
+MapEffect& MapEffect::operator=(const MapEffect& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/MapTile.cpp b/sigmod/MapTile.cpp
index 632ec035..769e2851 100644
--- a/sigmod/MapTile.cpp
+++ b/sigmod/MapTile.cpp
@@ -28,13 +28,15 @@
 #include "Sigmod.h"
 #include "Tile.h"
 
-Sigmod::MapTile::MapTile(const MapTile& tile) :
+using namespace Sigmod;
+
+MapTile::MapTile(const MapTile& tile) :
         Object(tile.parent(), tile.id())
 {
     *this = tile;
 }
 
-Sigmod::MapTile::MapTile(const Map* parent, const int id) :
+MapTile::MapTile(const Map* parent, const int id) :
         Object(parent, id),
         m_tile(-1),
         m_position(0, 0),
@@ -42,20 +44,20 @@ Sigmod::MapTile::MapTile(const Map* parent, const int id) :
 {
 }
 
-Sigmod::MapTile::MapTile(const MapTile& tile, const Map* parent, const int id) :
+MapTile::MapTile(const MapTile& tile, const Map* parent, const int id) :
         Object(parent, id)
 {
     *this = tile;
 }
 
-Sigmod::MapTile::MapTile(const QDomElement& xml, const Map* parent, const int id) :
+MapTile::MapTile(const QDomElement& xml, const Map* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::MapTile::validate()
+void MapTile::validate()
 {
     TEST_BEGIN();
     TEST(tile);
@@ -63,7 +65,7 @@ void Sigmod::MapTile::validate()
     TEST_END();
 }
 
-void Sigmod::MapTile::load(const QDomElement& xml)
+void MapTile::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(tile);
@@ -71,7 +73,7 @@ void Sigmod::MapTile::load(const QDomElement& xml)
     LOAD(zIndex);
 }
 
-QDomElement Sigmod::MapTile::save() const
+QDomElement MapTile::save() const
 {
     SAVE_CREATE();
     SAVE(tile);
@@ -96,7 +98,7 @@ CHECK_BEGIN(MapTile, QPoint&, position)
 CHECK_END()
 CHECK(MapTile, int, zIndex)
 
-Sigmod::MapTile& Sigmod::MapTile::operator=(const MapTile& rhs)
+MapTile& MapTile::operator=(const MapTile& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/MapTrainer.cpp b/sigmod/MapTrainer.cpp
index b5d23b00..37cf4f4b 100644
--- a/sigmod/MapTrainer.cpp
+++ b/sigmod/MapTrainer.cpp
@@ -28,13 +28,16 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::MapTrainer::MapTrainer(const MapTrainer& trainer) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+MapTrainer::MapTrainer(const MapTrainer& trainer) :
         Object(trainer.parent(), trainer.id())
 {
     *this = trainer;
 }
 
-Sigmod::MapTrainer::MapTrainer(const Map* parent, const int id) :
+MapTrainer::MapTrainer(const Map* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_trainerClass(INT_MAX),
@@ -44,25 +47,25 @@ Sigmod::MapTrainer::MapTrainer(const Map* parent, const int id) :
 {
 }
 
-Sigmod::MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) :
+MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) :
         Object(parent, id)
 {
     *this = trainer;
 }
 
-Sigmod::MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) :
+MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-Sigmod::MapTrainer::~MapTrainer()
+MapTrainer::~MapTrainer()
 {
     clear();
 }
 
-void Sigmod::MapTrainer::validate()
+void MapTrainer::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -85,7 +88,7 @@ void Sigmod::MapTrainer::validate()
     TEST_END();
 }
 
-void Sigmod::MapTrainer::load(const QDomElement& xml)
+void MapTrainer::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -97,7 +100,7 @@ void Sigmod::MapTrainer::load(const QDomElement& xml)
     LOAD_SUB(newTeamMember, MapTrainerTeamMember);
 }
 
-QDomElement Sigmod::MapTrainer::save() const
+QDomElement MapTrainer::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -114,14 +117,14 @@ SETTER(MapTrainer, QString&, Name, name)
 SETTER(MapTrainer, int, TrainerClass, trainerClass)
 SETTER(MapTrainer, QPoint&, Position, position)
 SETTER(MapTrainer, int, NumberFight, numberFight)
-SETTER(MapTrainer, Sigcore::Script&, Script, script)
+SETTER(MapTrainer, Script&, Script, script)
 SETTER_LIST_LIMIT(MapTrainer, LeadTeamMember, leadTeamMember, m_numberFight, "More lead team members than fighting")
 
 GETTER(MapTrainer, QString, name)
 GETTER(MapTrainer, int, trainerClass)
 GETTER(MapTrainer, QPoint, position)
 GETTER(MapTrainer, int, numberFight)
-GETTER(MapTrainer, Sigcore::Script, script)
+GETTER(MapTrainer, Script, script)
 GETTER_LIST(MapTrainer, leadTeamMember)
 
 CHECK(MapTrainer, QString&, name)
@@ -132,7 +135,7 @@ CHECK_BEGIN(MapTrainer, QPoint&, position)
     TBOUNDS_MOD(position_y, 0, map->height() - 1, position.y())
 CHECK_END()
 CHECK_BOUNDS(MapTrainer, int, numberFight, 1, sigmod()->rules()->maxFight())
-CHECK(MapTrainer, Sigcore::Script&, script)
+CHECK(MapTrainer, Script&, script)
 CHECK_BEGIN(MapTrainer, int, leadTeamMember)
     if (!teamMemberById(leadTeamMember))
     {
@@ -143,7 +146,7 @@ CHECK_END()
 
 SUBCLASS(MapTrainer, TeamMember, teamMember, teamMembers)
 
-Sigmod::MapTrainer& Sigmod::MapTrainer::operator=(const MapTrainer& rhs)
+MapTrainer& MapTrainer::operator=(const MapTrainer& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -158,7 +161,7 @@ Sigmod::MapTrainer& Sigmod::MapTrainer::operator=(const MapTrainer& rhs)
     return *this;
 }
 
-void Sigmod::MapTrainer::clear()
+void MapTrainer::clear()
 {
     m_leadTeamMember.clear();
     SUBCLASS_CLEAR(teamMembers);
diff --git a/sigmod/MapTrainerTeamMember.cpp b/sigmod/MapTrainerTeamMember.cpp
index bb09ad76..eefc0c62 100644
--- a/sigmod/MapTrainerTeamMember.cpp
+++ b/sigmod/MapTrainerTeamMember.cpp
@@ -34,33 +34,35 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) :
+using namespace Sigmod;
+
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) :
         Object(teamMember.parent(), teamMember.id())
 {
     *this = teamMember;
 }
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) :
         Object(parent, id),
         m_species(INT_MAX),
         m_level(INT_MAX)
 {
 }
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) :
         Object(parent, id)
 {
     *this = teamMember;
 }
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::MapTrainerTeamMember::validate()
+void MapTrainerTeamMember::validate()
 {
     TEST_BEGIN();
     TEST(species);
@@ -83,7 +85,7 @@ void Sigmod::MapTrainerTeamMember::validate()
     TEST_END();
 }
 
-void Sigmod::MapTrainerTeamMember::load(const QDomElement& xml)
+void MapTrainerTeamMember::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(species);
@@ -94,7 +96,7 @@ void Sigmod::MapTrainerTeamMember::load(const QDomElement& xml)
     LOAD_LIST(nature);
 }
 
-QDomElement Sigmod::MapTrainerTeamMember::save() const
+QDomElement MapTrainerTeamMember::save() const
 {
     SAVE_CREATE();
     SAVE(species);
@@ -110,7 +112,7 @@ SETTER(MapTrainerTeamMember, int, Species, species)
 SETTER(MapTrainerTeamMember, int, Level, level)
 SETTER_LIST_LIMIT(MapTrainerTeamMember, Ability, ability, sigmod()->rules()->maxAbilities(), "Cannot have anymore abilities")
 
-void Sigmod::MapTrainerTeamMember::setItem(const int item, const int count)
+void MapTrainerTeamMember::setItem(const int item, const int count)
 {
     if (count && itemCheck(item, count) && (!m_item.contains(item) || (count != m_item[item])))
     {
@@ -169,7 +171,7 @@ CHECK_BEGIN(MapTrainerTeamMember, int, move)
 CHECK_END()
 CHECK_INDEX(MapTrainerTeamMember, int, nature, sigmod(), nature)
 
-Sigmod::MapTrainerTeamMember& Sigmod::MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs)
+MapTrainerTeamMember& MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -183,7 +185,7 @@ Sigmod::MapTrainerTeamMember& Sigmod::MapTrainerTeamMember::operator=(const MapT
     return *this;
 }
 
-int Sigmod::MapTrainerTeamMember::heldWeight(const QMap<int, int>& items) const
+int MapTrainerTeamMember::heldWeight(const QMap<int, int>& items) const
 {
     int totalWeight = 0;
     QMap<int, int> itemsToCheck = (items.empty() ? m_item : items);
@@ -197,7 +199,7 @@ int Sigmod::MapTrainerTeamMember::heldWeight(const QMap<int, int>& items) const
     return totalWeight;
 }
 
-bool Sigmod::MapTrainerTeamMember::checkWeight(const int item, const int count) const
+bool MapTrainerTeamMember::checkWeight(const int item, const int count) const
 {
     const Species* species = sigmod()->speciesById(m_species);
     if (!species)
@@ -207,7 +209,7 @@ bool Sigmod::MapTrainerTeamMember::checkWeight(const int item, const int count)
     return (heldWeight(temp) <= species->maxHoldWeight());
 }
 
-bool Sigmod::MapTrainerTeamMember::canLearn(const int move) const
+bool MapTrainerTeamMember::canLearn(const int move) const
 {
     const Species* species = sigmod()->speciesById(m_species);
     if (species)
@@ -221,7 +223,7 @@ bool Sigmod::MapTrainerTeamMember::canLearn(const int move) const
     return !species;
 }
 
-void Sigmod::MapTrainerTeamMember::clear()
+void MapTrainerTeamMember::clear()
 {
     m_ability.clear();
     m_item.clear();
diff --git a/sigmod/MapWarp.cpp b/sigmod/MapWarp.cpp
index 7db29554..a251e834 100644
--- a/sigmod/MapWarp.cpp
+++ b/sigmod/MapWarp.cpp
@@ -27,15 +27,18 @@
 #include "Map.h"
 #include "Sigmod.h"
 
-const QStringList Sigmod::MapWarp::TypeStr = QStringList() << "Door" << "Warp" << "Hole" << "Boundary";
+using namespace Sigcore;
+using namespace Sigmod;
 
-Sigmod::MapWarp::MapWarp(const MapWarp& warp) :
+const QStringList MapWarp::TypeStr = QStringList() << "Door" << "Warp" << "Hole" << "Boundary";
+
+MapWarp::MapWarp(const MapWarp& warp) :
         Object(warp.parent(), warp.id())
 {
     *this = warp;
 }
 
-Sigmod::MapWarp::MapWarp(const Map* parent, const int id) :
+MapWarp::MapWarp(const Map* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_area(0, 0, 32, 32),
@@ -46,20 +49,20 @@ Sigmod::MapWarp::MapWarp(const Map* parent, const int id) :
 {
 }
 
-Sigmod::MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) :
+MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) :
         Object(parent, id)
 {
     *this = warp;
 }
 
-Sigmod::MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) :
+MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::MapWarp::validate()
+void MapWarp::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -70,7 +73,7 @@ void Sigmod::MapWarp::validate()
     TEST_END();
 }
 
-void Sigmod::MapWarp::load(const QDomElement& xml)
+void MapWarp::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -81,7 +84,7 @@ void Sigmod::MapWarp::load(const QDomElement& xml)
     LOAD(script);
 }
 
-QDomElement Sigmod::MapWarp::save() const
+QDomElement MapWarp::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -98,14 +101,14 @@ SETTER(MapWarp, QRect&, Area, area)
 SETTER(MapWarp, Type, Type, type)
 SETTER(MapWarp, int, ToMap, toMap)
 SETTER(MapWarp, int, ToWarp, toWarp)
-SETTER(MapWarp, Sigcore::Script&, Script, script)
+SETTER(MapWarp, Script&, Script, script)
 
 GETTER(MapWarp, QString, name)
 GETTER(MapWarp, QRect, area)
-GETTER(MapWarp, Sigmod::MapWarp::Type, type)
+GETTER(MapWarp, MapWarp::Type, type)
 GETTER(MapWarp, int, toMap)
 GETTER(MapWarp, int, toWarp)
-GETTER(MapWarp, Sigcore::Script, script)
+GETTER(MapWarp, Script, script)
 
 CHECK(MapWarp, QString&, name)
 CHECK_BEGIN(MapWarp, QRect&, area)
@@ -126,9 +129,9 @@ CHECK_BEGIN(MapWarp, int, toWarp)
     }
     IBOUNDS(toWarp, map, warp);
 CHECK_END()
-CHECK(MapWarp, Sigcore::Script&, script)
+CHECK(MapWarp, Script&, script)
 
-Sigmod::MapWarp& Sigmod::MapWarp::operator=(const MapWarp& rhs)
+MapWarp& MapWarp::operator=(const MapWarp& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/MapWildList.cpp b/sigmod/MapWildList.cpp
index 27820147..0d891994 100644
--- a/sigmod/MapWildList.cpp
+++ b/sigmod/MapWildList.cpp
@@ -26,37 +26,39 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::MapWildList::MapWildList(const MapWildList& wildList) :
+using namespace Sigmod;
+
+MapWildList::MapWildList(const MapWildList& wildList) :
         Object(wildList.parent(), wildList.id())
 {
     *this = wildList;
 }
 
-Sigmod::MapWildList::MapWildList(const Map* parent, const int id) :
+MapWildList::MapWildList(const Map* parent, const int id) :
         Object(parent, id),
         m_name("")
 {
 }
 
-Sigmod::MapWildList::MapWildList(const MapWildList& wildList, const Map* parent, const int id) :
+MapWildList::MapWildList(const MapWildList& wildList, const Map* parent, const int id) :
         Object(parent, id)
 {
     *this = wildList;
 }
 
-Sigmod::MapWildList::MapWildList(const QDomElement& xml, const Map* parent, const int id) :
+MapWildList::MapWildList(const QDomElement& xml, const Map* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-Sigmod::MapWildList::~MapWildList()
+MapWildList::~MapWildList()
 {
     clear();
 }
 
-void Sigmod::MapWildList::validate()
+void MapWildList::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -70,14 +72,14 @@ void Sigmod::MapWildList::validate()
     TEST_END();
 }
 
-void Sigmod::MapWildList::load(const QDomElement& xml)
+void MapWildList::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD_SUB(newEncounter, MapWildListEncounter);
 }
 
-QDomElement Sigmod::MapWildList::save() const
+QDomElement MapWildList::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -93,7 +95,7 @@ CHECK(MapWildList, QString&, name)
 
 SUBCLASS(MapWildList, Encounter, encounter, encounters)
 
-Sigmod::MapWildList& Sigmod::MapWildList::operator=(const MapWildList& rhs)
+MapWildList& MapWildList::operator=(const MapWildList& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -103,7 +105,7 @@ Sigmod::MapWildList& Sigmod::MapWildList::operator=(const MapWildList& rhs)
     return *this;
 }
 
-void Sigmod::MapWildList::clear()
+void MapWildList::clear()
 {
     SUBCLASS_CLEAR(encounters);
 }
diff --git a/sigmod/MapWildListEncounter.cpp b/sigmod/MapWildListEncounter.cpp
index 689a9adc..fb9510ad 100644
--- a/sigmod/MapWildListEncounter.cpp
+++ b/sigmod/MapWildListEncounter.cpp
@@ -29,13 +29,15 @@
 #include "Sigmod.h"
 #include "Species.h"
 
-Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter) :
+using namespace Sigmod;
+
+MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter) :
         Object(encounter.parent(), encounter.id())
 {
     *this = encounter;
 }
 
-Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int id) :
+MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int id) :
         Object(parent, id),
         m_species(INT_MAX),
         m_level(1),
@@ -43,20 +45,20 @@ Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, co
 {
 }
 
-Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter, const MapWildList* parent, const int id) :
+MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter, const MapWildList* parent, const int id) :
         Object(parent, id)
 {
     *this = encounter;
 }
 
-Sigmod::MapWildListEncounter::MapWildListEncounter(const QDomElement& xml, const MapWildList* parent, const int id) :
+MapWildListEncounter::MapWildListEncounter(const QDomElement& xml, const MapWildList* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::MapWildListEncounter::validate()
+void MapWildListEncounter::validate()
 {
     TEST_BEGIN();
     TEST(species);
@@ -65,7 +67,7 @@ void Sigmod::MapWildListEncounter::validate()
     TEST_END();
 }
 
-void Sigmod::MapWildListEncounter::load(const QDomElement& xml)
+void MapWildListEncounter::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(species);
@@ -73,7 +75,7 @@ void Sigmod::MapWildListEncounter::load(const QDomElement& xml)
     LOAD(weight);
 }
 
-QDomElement Sigmod::MapWildListEncounter::save() const
+QDomElement MapWildListEncounter::save() const
 {
     SAVE_CREATE();
     SAVE(species);
@@ -94,7 +96,7 @@ CHECK_INDEX(MapWildListEncounter, int, species, sigmod(), species)
 CHECK_BOUNDS(MapWildListEncounter, int, level, 1, sigmod()->rules()->maxLevel())
 CHECK_BOUNDS(MapWildListEncounter, int, weight, 1, INT_MAX)
 
-Sigmod::MapWildListEncounter& Sigmod::MapWildListEncounter::operator=(const MapWildListEncounter& rhs)
+MapWildListEncounter& MapWildListEncounter::operator=(const MapWildListEncounter& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Move.cpp b/sigmod/Move.cpp
index ba82c229..40e79999 100644
--- a/sigmod/Move.cpp
+++ b/sigmod/Move.cpp
@@ -29,13 +29,16 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::Move::Move(const Move& move) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Move::Move(const Move& move) :
         Object(move.parent(), move.id())
 {
     *this = move;
 }
 
-Sigmod::Move::Move(const Sigmod* parent, const int id) :
+Move::Move(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_accuracy(1, 1),
@@ -51,20 +54,20 @@ Sigmod::Move::Move(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Move::Move(const Move& move, const Sigmod* parent, const int id) :
+Move::Move(const Move& move, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = move;
 }
 
-Sigmod::Move::Move(const QDomElement& xml, const Sigmod* parent, const int id) :
+Move::Move(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Move::validate()
+void Move::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -76,7 +79,7 @@ void Sigmod::Move::validate()
     TEST_END();
 }
 
-void Sigmod::Move::load(const QDomElement& xml)
+void Move::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -92,7 +95,7 @@ void Sigmod::Move::load(const QDomElement& xml)
     LOAD(priorityScript);
 }
 
-QDomElement Sigmod::Move::save() const
+QDomElement Move::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -110,31 +113,31 @@ QDomElement Sigmod::Move::save() const
 }
 
 SETTER(Move, QString&, Name, name)
-SETTER(Move, Sigcore::Fraction&, Accuracy, accuracy)
+SETTER(Move, Fraction&, Accuracy, accuracy)
 SETTER(Move, int, Power, power)
 SETTER(Move, int, Type, type)
 SETTER(Move, bool, Special, special)
 SETTER(Move, int, PowerPoints, powerPoints)
 SETTER(Move, int, Priority, priority)
 SETTER(Move, QString&, Description, description)
-SETTER(Move, Sigcore::Script&, BattleScript, battleScript)
-SETTER(Move, Sigcore::Script&, WorldScript, worldScript)
-SETTER(Move, Sigcore::Script&, PriorityScript, priorityScript)
+SETTER(Move, Script&, BattleScript, battleScript)
+SETTER(Move, Script&, WorldScript, worldScript)
+SETTER(Move, Script&, PriorityScript, priorityScript)
 
 GETTER(Move, QString, name)
-GETTER(Move, Sigcore::Fraction, accuracy)
+GETTER(Move, Fraction, accuracy)
 GETTER(Move, int, power)
 GETTER(Move, int, type)
 GETTER(Move, bool, special)
 GETTER(Move, int, powerPoints)
 GETTER(Move, int, priority)
 GETTER(Move, QString, description)
-GETTER(Move, Sigcore::Script, battleScript)
-GETTER(Move, Sigcore::Script, worldScript)
-GETTER(Move, Sigcore::Script, priorityScript)
+GETTER(Move, Script, battleScript)
+GETTER(Move, Script, worldScript)
+GETTER(Move, Script, priorityScript)
 
 CHECK(Move, QString&, name)
-CHECK_BEGIN(Move, Sigcore::Fraction&, accuracy)
+CHECK_BEGIN(Move, Fraction&, accuracy)
     TBOUNDS(accuracy, 0, 1);
     TBOUNDS_MOD(accuracy, 1, INT_MAX, accuracy.numerator());
 CHECK_END()
@@ -144,11 +147,11 @@ CHECK(Move, bool, special)
 CHECK_BOUNDS(Move, int, powerPoints, 1, INT_MAX)
 CHECK(Move, int, priority)
 CHECK(Move, QString&, description)
-CHECK(Move, Sigcore::Script&, battleScript)
-CHECK(Move, Sigcore::Script&, worldScript)
-CHECK(Move, Sigcore::Script&, priorityScript)
+CHECK(Move, Script&, battleScript)
+CHECK(Move, Script&, worldScript)
+CHECK(Move, Script&, priorityScript)
 
-Sigmod::Move& Sigmod::Move::operator=(const Move& rhs)
+Move& Move::operator=(const Move& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Nature.cpp b/sigmod/Nature.cpp
index 487bbfdc..ab98d01e 100644
--- a/sigmod/Nature.cpp
+++ b/sigmod/Nature.cpp
@@ -27,14 +27,17 @@
 #include "Rules.h"
 #include "Sigmod.h"
 
-Sigmod::Nature::Nature(const Nature& nature) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Nature::Nature(const Nature& nature) :
         Object(nature.parent(), nature.id()),
         m_stat(ST_SpecialDefense - ST_Attack + 1)
 {
     *this = nature;
 }
 
-Sigmod::Nature::Nature(const Sigmod* parent, const int id) :
+Nature::Nature(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_stat(ST_SpecialDefense - ST_Attack + 1),
@@ -44,14 +47,14 @@ Sigmod::Nature::Nature(const Sigmod* parent, const int id) :
         m_stat[i].set(1, 1);
 }
 
-Sigmod::Nature::Nature(const Nature& nature, const Sigmod* parent, const int id) :
+Nature::Nature(const Nature& nature, const Sigmod* parent, const int id) :
         Object(parent, id),
         m_stat(ST_SpecialDefense - ST_Attack + 1)
 {
     *this = nature;
 }
 
-Sigmod::Nature::Nature(const QDomElement& xml, const Sigmod* parent, const int id) :
+Nature::Nature(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id),
         m_stat(ST_SpecialDefense - ST_Attack + 1)
 {
@@ -59,7 +62,7 @@ Sigmod::Nature::Nature(const QDomElement& xml, const Sigmod* parent, const int i
     load(xml);
 }
 
-void Sigmod::Nature::validate()
+void Nature::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -78,7 +81,7 @@ void Sigmod::Nature::validate()
     TEST_END();
 }
 
-void Sigmod::Nature::load(const QDomElement& xml)
+void Nature::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -86,7 +89,7 @@ void Sigmod::Nature::load(const QDomElement& xml)
     LOAD(weight);
 }
 
-QDomElement Sigmod::Nature::save() const
+QDomElement Nature::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -96,15 +99,15 @@ QDomElement Sigmod::Nature::save() const
 }
 
 SETTER(Nature, QString&, Name, name)
-SETTER_ARRAY(Nature, Sigcore::Fraction&, Stat, stat, multiplier, Stat, stat, ST_Attack)
+SETTER_ARRAY(Nature, Fraction&, Stat, stat, multiplier, Stat, stat, ST_Attack)
 SETTER(Nature, int, Weight, weight)
 
 GETTER(Nature, QString, name)
-GETTER_ARRAY(Nature, Sigcore::Fraction, stat, multiplier, Stat, stat, ST_Attack)
+GETTER_ARRAY(Nature, Fraction, stat, multiplier, Stat, stat, ST_Attack)
 GETTER(Nature, int, weight)
 
 CHECK(Nature, QString&, name)
-CHECK_BEGIN_ARRAY(Nature, Sigcore::Fraction&, stat, multiplier, Stat, stat)
+CHECK_BEGIN_ARRAY(Nature, Fraction&, stat, multiplier, Stat, stat)
     switch (stat)
     {
         case ST_SpecialDefense:
@@ -123,7 +126,7 @@ CHECK_BEGIN_ARRAY(Nature, Sigcore::Fraction&, stat, multiplier, Stat, stat)
 CHECK_END()
 CHECK_BOUNDS(Nature, int, weight, 1, INT_MAX)
 
-Sigmod::Nature& Sigmod::Nature::operator=(const Nature& rhs)
+Nature& Nature::operator=(const Nature& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Object.cpp b/sigmod/Object.cpp
index de1b6a0e..770d7abf 100644
--- a/sigmod/Object.cpp
+++ b/sigmod/Object.cpp
@@ -25,23 +25,26 @@
 // Sigmod includes
 #include "Macros.h"
 
-Sigmod::Object::Object(const Object* parent, const int id) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Object::Object(const Object* parent, const int id) :
         QObject(NULL),
         m_id(id),
         m_parent(parent)
 {
 }
 
-Sigmod::Object::~Object()
+Object::~Object()
 {
 }
 
-const Sigmod::Object* Sigmod::Object::parent() const
+const Object* Object::parent() const
 {
     return m_parent;
 }
 
-const Sigmod::Sigmod* Sigmod::Object::sigmod() const
+const Sigmod* Object::sigmod() const
 {
     if (m_parent)
         return m_parent->sigmod();
@@ -54,24 +57,24 @@ SETTER(Object, int, Id, id)
 
 CHECK_BOUNDS(Object, int, id, 0, INT_MAX)
 
-QDomDocument Sigmod::Object::xml(const Object* object)
+QDomDocument Object::xml(const Object* object)
 {
     QDomDocument xml(object->className());
     xml.appendChild(object->save());
     return xml;
 }
 
-QString Sigmod::Object::className() const
+QString Object::className() const
 {
     return QString(metaObject()->className()).section(':', -1);
 }
 
-QString Sigmod::Object::unused(const QString& variable)
+QString Object::unused(const QString& variable)
 {
     return QString("Setting unused variable %1").arg(variable);
 }
 
-QString Sigmod::Object::bounds(const QString& variable, const int min, const int max, const int value)
+QString Object::bounds(const QString& variable, const int min, const int max, const int value)
 {
     QString msg = QString("Value for %1 out-of-bounds (%2 -- %3) (%4)").arg(variable);
     if (min == INT_MIN)
@@ -85,7 +88,7 @@ QString Sigmod::Object::bounds(const QString& variable, const int min, const int
     return msg.arg(value);
 }
 
-QString Sigmod::Object::bounds(const QString& variable, const int min, const int max, const Sigcore::Fraction& value)
+QString Object::bounds(const QString& variable, const int min, const int max, const Fraction& value)
 {
     QString msg = QString("Value for %1 out-of-bounds (%2 -- %3) (%4 / %5)").arg(variable);
     if (min == INT_MIN)
@@ -99,31 +102,31 @@ QString Sigmod::Object::bounds(const QString& variable, const int min, const int
     return msg.arg(value.numerator()).arg(value.denominator());
 }
 
-QString Sigmod::Object::bounds(const QString& variable, const QString& min, const QString& max, const int value)
+QString Object::bounds(const QString& variable, const QString& min, const QString& max, const int value)
 {
     return QString("Value for %1 out-of-bounds (%2 -- %3) (%4)").arg(variable).arg(min).arg(max).arg(value);
 }
 
-QString Sigmod::Object::bounds(const QString& variable, const int value)
+QString Object::bounds(const QString& variable, const int value)
 {
     return QString("Value for %1 out-of-bounds (invalid id) (%2)").arg(variable).arg(value);
 }
 
-QString Sigmod::Object::bounds(const QString& variable, const QString& value)
+QString Object::bounds(const QString& variable, const QString& value)
 {
     return QString("Value for %1 out-of-bounds (%2)").arg(variable).arg(value);
 }
 
-QString Sigmod::Object::subclass(const QString& subclass, const int id)
+QString Object::subclass(const QString& subclass, const int id)
 {
     return QString("Duplicate %1 with id %2").arg(subclass, id);
 }
 
-QString Sigmod::Object::subclass(const QString& subclass, const QString& name)
+QString Object::subclass(const QString& subclass, const QString& name)
 {
     return QString("Duplicate %1 with name %2").arg(subclass, name);
 }
 
-void Sigmod::Object::clear()
+void Object::clear()
 {
 }
diff --git a/sigmod/Rules.cpp b/sigmod/Rules.cpp
index 5ea72d7a..15b3846b 100644
--- a/sigmod/Rules.cpp
+++ b/sigmod/Rules.cpp
@@ -22,15 +22,17 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-const QStringList Sigmod::Rules::DVStr = QStringList() << "16" << "32";
+using namespace Sigmod;
 
-Sigmod::Rules::Rules(const Rules& rules) :
+const QStringList Rules::DVStr = QStringList() << "16" << "32";
+
+Rules::Rules(const Rules& rules) :
         Object(rules.parent(), 0)
 {
     *this = rules;
 }
 
-Sigmod::Rules::Rules(const Sigmod* parent) :
+Rules::Rules(const Sigmod* parent) :
         Object(parent, 0),
         m_genderAllowed(false),
         m_breedingAllowed(false),
@@ -58,19 +60,19 @@ Sigmod::Rules::Rules(const Sigmod* parent) :
 {
 }
 
-Sigmod::Rules::Rules(const Rules& rules, const Sigmod* parent) :
+Rules::Rules(const Rules& rules, const Sigmod* parent) :
         Object(parent, 0)
 {
     *this = rules;
 }
 
-Sigmod::Rules::Rules(const QDomElement& xml, const Sigmod* parent) :
+Rules::Rules(const QDomElement& xml, const Sigmod* parent) :
         Object(parent, 0)
 {
     load(xml);
 }
 
-void Sigmod::Rules::validate()
+void Rules::validate()
 {
     TEST_BEGIN();
     TEST(breedingAllowed);
@@ -97,7 +99,7 @@ void Sigmod::Rules::validate()
     TEST_END();
 }
 
-void Sigmod::Rules::load(const QDomElement& xml)
+void Rules::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(genderAllowed);
@@ -125,7 +127,7 @@ void Sigmod::Rules::load(const QDomElement& xml)
     LOAD(maxEVPerStat);
 }
 
-QDomElement Sigmod::Rules::save() const
+QDomElement Rules::save() const
 {
     QDomElement xml = QDomDocument().createElement(className());
     SAVE(genderAllowed);
@@ -247,7 +249,7 @@ CHECK_BEGIN(Rules, int, maxEVPerStat)
         TBOUNDS(maxEVPerStat, 0, m_maxTotalEV);
 CHECK_END()
 
-Sigmod::Rules& Sigmod::Rules::operator=(const Rules& rhs)
+Rules& Rules::operator=(const Rules& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Sigmod.cpp b/sigmod/Sigmod.cpp
index 7e255e08..8a829be9 100644
--- a/sigmod/Sigmod.cpp
+++ b/sigmod/Sigmod.cpp
@@ -47,7 +47,10 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::Sigmod::Sigmod() :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Sigmod::Sigmod() :
         Object(NULL, 0),
         m_title(""),
         m_version(""),
@@ -59,27 +62,27 @@ Sigmod::Sigmod::Sigmod() :
 {
 }
 
-Sigmod::Sigmod::Sigmod(const Sigmod& sigmod) :
+Sigmod::Sigmod(const Sigmod& sigmod) :
         Object(NULL, 0),
         m_rules(new Rules(this))
 {
     *this = sigmod;
 }
 
-Sigmod::Sigmod::Sigmod(const QDomElement& xml) :
+Sigmod::Sigmod(const QDomElement& xml) :
         Object(NULL, 0),
         m_rules(new Rules(this))
 {
     load(xml);
 }
 
-Sigmod::Sigmod::~Sigmod()
+Sigmod::~Sigmod()
 {
     delete m_rules;
     clear();
 }
 
-void Sigmod::Sigmod::validate()
+void Sigmod::validate()
 {
     TEST_BEGIN();
     if (m_title.isEmpty())
@@ -267,7 +270,7 @@ void Sigmod::Sigmod::validate()
     TEST_END();
 }
 
-void Sigmod::Sigmod::load(const QDomElement& xml)
+void Sigmod::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(title);
@@ -302,7 +305,7 @@ void Sigmod::Sigmod::load(const QDomElement& xml)
     m_typechart.resize(typeCount(), typeCount());
 }
 
-QDomElement Sigmod::Sigmod::save() const
+QDomElement Sigmod::save() const
 {
     QDomElement xml = QDomDocument().createElement(className());
     SAVE(title);
@@ -341,15 +344,15 @@ SETTER(Sigmod, QString&, Title, title)
 SETTER(Sigmod, QString&, Version, version)
 SETTER(Sigmod, QString&, Description, description)
 SETTER(Sigmod, bool, SinglePlayer, singlePlayer)
-SETTER(Sigmod, Sigcore::Script&, StartScript, startScript)
-SETTER_MATRIX(Sigmod, Sigcore::Fraction&, Typechart, typechart, multiplier)
+SETTER(Sigmod, Script&, StartScript, startScript)
+SETTER_MATRIX(Sigmod, Fraction&, Typechart, typechart, multiplier)
 
-void Sigmod::Sigmod::setRules(const Rules& rules)
+void Sigmod::setRules(const Rules& rules)
 {
     *m_rules = rules;
 }
 
-void Sigmod::Sigmod::setRules(const QDomElement& xml)
+void Sigmod::setRules(const QDomElement& xml)
 {
     m_rules->load(xml);
 }
@@ -358,29 +361,29 @@ GETTER(Sigmod, QString, title)
 GETTER(Sigmod, QString, version)
 GETTER(Sigmod, QString, description)
 GETTER(Sigmod, bool, singlePlayer)
-GETTER(Sigmod, Sigcore::Script, startScript)
+GETTER(Sigmod, Script, startScript)
 
-const Sigcore::Matrix<Sigcore::Fraction>* Sigmod::Sigmod::typechart() const
+const Matrix<Fraction>* Sigmod::typechart() const
 {
     return &m_typechart;
 }
 
-Sigcore::Matrix<Sigcore::Fraction>* Sigmod::Sigmod::typechart()
+Matrix<Fraction>* Sigmod::typechart()
 {
     return &m_typechart;
 }
 
-Sigcore::Fraction Sigmod::Sigmod::typechart(const int attack, const int defense) const
+Fraction Sigmod::typechart(const int attack, const int defense) const
 {
     return m_typechart(attack, defense);
 }
 
-const Sigmod::Rules* Sigmod::Sigmod::rules() const
+const Rules* Sigmod::rules() const
 {
     return m_rules;
 }
 
-Sigmod::Rules* Sigmod::Sigmod::rules()
+Rules* Sigmod::rules()
 {
     return m_rules;
 }
@@ -389,8 +392,8 @@ CHECK(Sigmod, QString&, title)
 CHECK(Sigmod, QString&, version)
 CHECK(Sigmod, QString&, description)
 CHECK(Sigmod, bool, singlePlayer)
-CHECK(Sigmod, Sigcore::Script&, startScript)
-CHECK_BOUNDS(Sigmod, Sigcore::Fraction&, typechart, 0, INT_MAX)
+CHECK(Sigmod, Script&, startScript)
+CHECK_BOUNDS(Sigmod, Fraction&, typechart, 0, INT_MAX)
 
 SSUBCLASS(Sigmod, Ability, ability, abilities)
 SSUBCLASS(Sigmod, Author, author, authors)
@@ -413,31 +416,31 @@ SSUBCLASS(Sigmod, Tile, tile, tiles)
 SSUBCLASS(Sigmod, Time, time, times)
 SSUBCLASS(Sigmod, Trainer, trainer, trainers)
 
-const Sigmod::Type* Sigmod::Sigmod::type(const int index) const
+const Sigmod::Type* Sigmod::type(const int index) const
 {
     if (index < typeCount())
         return m_types.at(index);
     return NULL;
 }
 
-Sigmod::Type* Sigmod::Sigmod::type(const int index)
+Sigmod::Type* Sigmod::type(const int index)
 {
     if (index < typeCount())
         return m_types[index];
     return NULL;
 }
 
-const Sigmod::Type* Sigmod::Sigmod::typeById(const int id) const
+const Sigmod::Type* Sigmod::typeById(const int id) const
 {
     return type(typeIndex(id));
 }
 
-Sigmod::Type* Sigmod::Sigmod::typeById(const int id)
+Sigmod::Type* Sigmod::typeById(const int id)
 {
     return type(typeIndex(id));
 }
 
-int Sigmod::Sigmod::typeIndex(const int id) const
+int Sigmod::typeIndex(const int id) const
 {
     for (int i = 0; i < typeCount(); ++i)
     {
@@ -447,34 +450,34 @@ int Sigmod::Sigmod::typeIndex(const int id) const
     return INT_MAX;
 }
 
-int Sigmod::Sigmod::typeCount() const
+int Sigmod::typeCount() const
 {
     return m_types.size();
 }
 
-Sigmod::Type* Sigmod::Sigmod::newType()
+Sigmod::Type* Sigmod::newType()
 {
     return newType(new Type(this, newTypeId()));
 }
 
-Sigmod::Type* Sigmod::Sigmod::newType(const QDomElement& xml)
+Sigmod::Type* Sigmod::newType(const QDomElement& xml)
 {
     return newType(new Type(xml, this, newTypeId()));
 }
 
-Sigmod::Type* Sigmod::Sigmod::newType(const Type& type)
+Sigmod::Type* Sigmod::newType(const Type& type)
 {
     return newType(new Type(type, this, newTypeId()));
 }
 
-Sigmod::Type* Sigmod::Sigmod::newType(Type* type)
+Sigmod::Type* Sigmod::newType(Type* type)
 {
     m_types.append(type);
     m_typechart.resize(typeCount(), typeCount(), Sigcore::Fraction(1, 1));
     return type;
 }
 
-void Sigmod::Sigmod::deleteType(const int index)
+void Sigmod::deleteType(const int index)
 {
     if (index < typeCount())
     {
@@ -484,12 +487,12 @@ void Sigmod::Sigmod::deleteType(const int index)
     }
 }
 
-void Sigmod::Sigmod::deleteTypeById(const int id)
+void Sigmod::deleteTypeById(const int id)
 {
     deleteType(typeIndex(id));
 }
 
-int Sigmod::Sigmod::newTypeId() const
+int Sigmod::newTypeId() const
 {
     int i = 0;
     while ((i < typeCount()) && (typeIndex(i) != INT_MAX))
@@ -499,7 +502,7 @@ int Sigmod::Sigmod::newTypeId() const
 
 SSUBCLASS(Sigmod, Weather, weather, weathers)
 
-Sigmod::Sigmod& Sigmod::Sigmod::operator=(const Sigmod& rhs)
+Sigmod::Sigmod& Sigmod::operator=(const Sigmod& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -537,7 +540,7 @@ Sigmod::Sigmod& Sigmod::Sigmod::operator=(const Sigmod& rhs)
     return *this;
 }
 
-void Sigmod::Sigmod::clear()
+void Sigmod::clear()
 {
     SUBCLASS_CLEAR(abilities);
     SUBCLASS_CLEAR(badges);
diff --git a/sigmod/Skin.cpp b/sigmod/Skin.cpp
index 4bba06aa..ee6b00c4 100644
--- a/sigmod/Skin.cpp
+++ b/sigmod/Skin.cpp
@@ -26,33 +26,36 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Skin::Skin(const Skin& skin) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Skin::Skin(const Skin& skin) :
         Object(skin.parent(), skin.id())
 {
     *this = skin;
 }
 
-Sigmod::Skin::Skin(const Sigmod* parent, const int id) :
+Skin::Skin(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_script("", "")
 {
 }
 
-Sigmod::Skin::Skin(const Skin& skin, const Sigmod* parent, const int id) :
+Skin::Skin(const Skin& skin, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = skin;
 }
 
-Sigmod::Skin::Skin(const QDomElement& xml, const Sigmod* parent, const int id) :
+Skin::Skin(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Skin::validate()
+void Skin::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -60,14 +63,14 @@ void Sigmod::Skin::validate()
     TEST_END();
 }
 
-void Sigmod::Skin::load(const QDomElement& xml)
+void Skin::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD(script);
 }
 
-QDomElement Sigmod::Skin::save() const
+QDomElement Skin::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -76,15 +79,15 @@ QDomElement Sigmod::Skin::save() const
 }
 
 SETTER(Skin, QString&, Name, name)
-SETTER(Skin, Sigcore::Script&, Script, script)
+SETTER(Skin, Script&, Script, script)
 
 GETTER(Skin, QString, name)
-GETTER(Skin, Sigcore::Script, script)
+GETTER(Skin, Script, script)
 
 CHECK(Skin, QString&, name)
-CHECK(Skin, Sigcore::Script&, script)
+CHECK(Skin, Script&, script)
 
-Sigmod::Skin& Sigmod::Skin::operator=(const Skin& rhs)
+Skin& Skin::operator=(const Skin& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Sound.cpp b/sigmod/Sound.cpp
index 32a66994..c0f62820 100644
--- a/sigmod/Sound.cpp
+++ b/sigmod/Sound.cpp
@@ -26,15 +26,17 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-const QStringList Sigmod::Sound::TypeStr = QStringList() << "Sound Effect" << "Music";
+using namespace Sigmod;
 
-Sigmod::Sound::Sound(const Sound& sound) :
+const QStringList Sound::TypeStr = QStringList() << "Sound Effect" << "Music";
+
+Sound::Sound(const Sound& sound) :
         Object(sound.parent(), sound.id())
 {
     *this = sound;
 }
 
-Sigmod::Sound::Sound(const Sigmod* parent, const int id) :
+Sound::Sound(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_type(SoundEffect),
@@ -42,20 +44,20 @@ Sigmod::Sound::Sound(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Sound::Sound(const Sound& sound, const Sigmod* parent, const int id) :
+Sound::Sound(const Sound& sound, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = sound;
 }
 
-Sigmod::Sound::Sound(const QDomElement& xml, const Sigmod* parent, const int id) :
+Sound::Sound(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Sound::validate()
+void Sound::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -65,7 +67,7 @@ void Sigmod::Sound::validate()
     TEST_END();
 }
 
-void Sigmod::Sound::load(const QDomElement& xml)
+void Sound::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -73,7 +75,7 @@ void Sigmod::Sound::load(const QDomElement& xml)
     LOAD(data);
 }
 
-QDomElement Sigmod::Sound::save() const
+QDomElement Sound::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -87,14 +89,14 @@ SETTER(Sound, Type, Type, type)
 SETTER(Sound, QByteArray&, Data, data)
 
 GETTER(Sound, QString, name)
-GETTER(Sound, Sigmod::Sound::Type, type)
+GETTER(Sound, Sound::Type, type)
 GETTER(Sound, QByteArray, data)
 
 CHECK(Sound, QString&, name)
 CHECK(Sound, Type, type)
 CHECK(Sound, QByteArray&, data)
 
-Sigmod::Sound& Sigmod::Sound::operator=(const Sound& rhs)
+Sound& Sound::operator=(const Sound& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Species.cpp b/sigmod/Species.cpp
index 5ab16206..42884220 100644
--- a/sigmod/Species.cpp
+++ b/sigmod/Species.cpp
@@ -27,9 +27,12 @@
 // Qt includes
 #include <QtCore/QSet>
 
-const QStringList Sigmod::Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic";
+using namespace Sigcore;
+using namespace Sigmod;
 
-Sigmod::Species::Species(const Species& species) :
+const QStringList Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic";
+
+Species::Species(const Species& species) :
         Object(species.parent(), species.id()),
         m_baseStat(ST_SpecialDefense - ST_HP + 1),
         m_effortValue(ST_SpecialDefense - ST_HP + 1)
@@ -37,7 +40,7 @@ Sigmod::Species::Species(const Species& species) :
     *this = species;
 }
 
-Sigmod::Species::Species(const Sigmod* parent, const int id) :
+Species::Species(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_baseStat(ST_SpecialDefense - ST_HP + 1),
@@ -69,7 +72,7 @@ Sigmod::Species::Species(const Sigmod* parent, const int id) :
         m_effortValue[i] = 0;
 }
 
-Sigmod::Species::Species(const Species& species, const Sigmod* parent, const int id) :
+Species::Species(const Species& species, const Sigmod* parent, const int id) :
         Object(parent, id),
         m_baseStat(ST_SpecialDefense - ST_HP + 1),
         m_effortValue(ST_SpecialDefense - ST_HP + 1)
@@ -77,7 +80,7 @@ Sigmod::Species::Species(const Species& species, const Sigmod* parent, const int
     *this = species;
 }
 
-Sigmod::Species::Species(const QDomElement& xml, const Sigmod* parent, const int id) :
+Species::Species(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id),
         m_baseStat(ST_SpecialDefense - ST_HP + 1),
         m_effortValue(ST_SpecialDefense - ST_HP + 1)
@@ -86,12 +89,12 @@ Sigmod::Species::Species(const QDomElement& xml, const Sigmod* parent, const int
     load(xml);
 }
 
-Sigmod::Species::~Species()
+Species::~Species()
 {
     clear();
 }
 
-void Sigmod::Species::validate()
+void Species::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -171,7 +174,7 @@ void Sigmod::Species::validate()
     TEST_END();
 }
 
-void Sigmod::Species::load(const QDomElement& xml)
+void Species::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -204,7 +207,7 @@ void Sigmod::Species::load(const QDomElement& xml)
     LOAD_SUB(newMove, SpeciesMove);
 }
 
-QDomElement Sigmod::Species::save() const
+QDomElement Species::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -245,9 +248,9 @@ SETTER(Species, Style, Growth, growth)
 SETTER(Species, int, ExperienceValue, experienceValue)
 SETTER(Species, int, CatchValue, catchValue)
 SETTER(Species, int, MaxHoldWeight, maxHoldWeight)
-SETTER(Species, Sigcore::Fraction&, RunChance, runChance)
-SETTER(Species, Sigcore::Fraction&, FleeChance, fleeChance)
-SETTER(Species, Sigcore::Fraction&, ItemChance, itemChance)
+SETTER(Species, Fraction&, RunChance, runChance)
+SETTER(Species, Fraction&, FleeChance, fleeChance)
+SETTER(Species, Fraction&, ItemChance, itemChance)
 SETTER(Species, int, EncyclopediaNumber, encyclopediaNumber)
 SETTER(Species, int, Weight, weight)
 SETTER(Species, int, Height, height)
@@ -257,25 +260,25 @@ SETTER(Species, int, FrontFemaleSprite, frontFemaleSprite)
 SETTER(Species, int, BackFemaleSprite, backFemaleSprite)
 SETTER(Species, int, Skin, skin)
 SETTER(Species, QString&, EncyclopediaEntry, encyclopediaEntry)
-SETTER(Species, Sigcore::Fraction&, GenderFactor, genderFactor)
+SETTER(Species, Fraction&, GenderFactor, genderFactor)
 SETTER(Species, int, EggSpecies, eggSpecies)
 SETTER(Species, int, EggSteps, eggSteps)
 SETTER_LIST(Species, Type, type)
 SETTER_LIST(Species, EggGroup, eggGroup)
-SETTER(Species, Sigcore::Script&, Evolution, evolution)
+SETTER(Species, Script&, Evolution, evolution)
 SETTER_MAP(Species, Ability, ability, weight)
 SETTER_MAP(Species, Item, item, weight)
 
 GETTER(Species, QString, name)
 GETTER_ARRAY(Species, int, baseStat, baseStat, Stat, stat, ST_HP)
 GETTER_ARRAY(Species, int, effortValue, effortValue, Stat, stat, ST_HP)
-GETTER(Species, Sigmod::Species::Style, growth)
+GETTER(Species, Species::Style, growth)
 GETTER(Species, int, experienceValue)
 GETTER(Species, int, catchValue)
 GETTER(Species, int, maxHoldWeight)
-GETTER(Species, Sigcore::Fraction, runChance)
-GETTER(Species, Sigcore::Fraction, fleeChance)
-GETTER(Species, Sigcore::Fraction, itemChance)
+GETTER(Species, Fraction, runChance)
+GETTER(Species, Fraction, fleeChance)
+GETTER(Species, Fraction, itemChance)
 GETTER(Species, int, encyclopediaNumber)
 GETTER(Species, int, weight)
 GETTER(Species, int, height)
@@ -285,12 +288,12 @@ GETTER(Species, int, frontFemaleSprite)
 GETTER(Species, int, backFemaleSprite)
 GETTER(Species, int, skin)
 GETTER(Species, QString, encyclopediaEntry)
-GETTER(Species, Sigcore::Fraction, genderFactor)
+GETTER(Species, Fraction, genderFactor)
 GETTER(Species, int, eggSpecies)
 GETTER(Species, int, eggSteps)
 GETTER_LIST(Species, type)
 GETTER_LIST(Species, eggGroup)
-GETTER(Species, Sigcore::Script, evolution)
+GETTER(Species, Script, evolution)
 GETTER_MAP(Species, ability)
 GETTER_MAP(Species, item)
 
@@ -333,9 +336,9 @@ CHECK(Species, Style, growth)
 CHECK_BOUNDS(Species, int, experienceValue, 0, INT_MAX)
 CHECK_BOUNDS(Species, int, catchValue, 1, 255)
 CHECK_BOUNDS(Species, int, maxHoldWeight, -1, INT_MAX)
-CHECK_BOUNDS(Species, Sigcore::Fraction&, runChance, 0, 1)
-CHECK_BOUNDS(Species, Sigcore::Fraction&, fleeChance, 0, 1)
-CHECK_BOUNDS(Species, Sigcore::Fraction&, itemChance, 0, 1)
+CHECK_BOUNDS(Species, Fraction&, runChance, 0, 1)
+CHECK_BOUNDS(Species, Fraction&, fleeChance, 0, 1)
+CHECK_BOUNDS(Species, Fraction&, itemChance, 0, 1)
 CHECK_BOUNDS(Species, int, encyclopediaNumber, -1, INT_MAX)
 CHECK_BOUNDS(Species, int, weight, 0, INT_MAX)
 CHECK_BOUNDS(Species, int, height, 0, INT_MAX)
@@ -373,12 +376,12 @@ CHECK_BEGIN(Species, int, backFemaleSprite)
 CHECK_END()
 CHECK_INDEX(Species, int, skin, sigmod(), skin)
 CHECK(Species, QString&, encyclopediaEntry)
-CHECK_BOUNDS(Species, Sigcore::Fraction&, genderFactor, -1, 1)
+CHECK_BOUNDS(Species, Fraction&, genderFactor, -1, 1)
 CHECK_INDEX(Species, int, eggSpecies, sigmod(), species)
 CHECK_BOUNDS(Species, int, eggSteps, 1, INT_MAX)
 CHECK_INDEX(Species, int, type, sigmod(), type)
 CHECK_INDEX(Species, int, eggGroup, sigmod(), eggGroup)
-CHECK(Species, Sigcore::Script&, evolution)
+CHECK(Species, Script&, evolution)
 CHECK_BEGIN_ARRAY(Species, int, ability, weight, int, ability)
     IBOUNDS(ability, sigmod(), ability);
     TBOUNDS_MOD(ability_weight, 1, INT_MAX, weight)
@@ -390,7 +393,7 @@ CHECK_END()
 
 SUBCLASS(Species, Move, move, moves)
 
-Sigmod::Species& Sigmod::Species::operator=(const Species& rhs)
+Species& Species::operator=(const Species& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -426,7 +429,7 @@ Sigmod::Species& Sigmod::Species::operator=(const Species& rhs)
     return *this;
 }
 
-void Sigmod::Species::clear()
+void Species::clear()
 {
     m_type.clear();
     m_eggGroup.clear();
diff --git a/sigmod/SpeciesMove.cpp b/sigmod/SpeciesMove.cpp
index fddc4974..0598e000 100644
--- a/sigmod/SpeciesMove.cpp
+++ b/sigmod/SpeciesMove.cpp
@@ -28,13 +28,15 @@
 #include "Sigmod.h"
 #include "Species.h"
 
-Sigmod::SpeciesMove::SpeciesMove(const SpeciesMove& move) :
+using namespace Sigmod;
+
+SpeciesMove::SpeciesMove(const SpeciesMove& move) :
         Object(move.parent(), move.id())
 {
     *this = move;
 }
 
-Sigmod::SpeciesMove::SpeciesMove(const Species* parent, const int id) :
+SpeciesMove::SpeciesMove(const Species* parent, const int id) :
         Object(parent, id),
         m_move(INT_MAX),
         m_level(0),
@@ -42,20 +44,20 @@ Sigmod::SpeciesMove::SpeciesMove(const Species* parent, const int id) :
 {
 }
 
-Sigmod::SpeciesMove::SpeciesMove(const SpeciesMove& move, const Species* parent, const int id) :
+SpeciesMove::SpeciesMove(const SpeciesMove& move, const Species* parent, const int id) :
         Object(parent, id)
 {
     *this = move;
 }
 
-Sigmod::SpeciesMove::SpeciesMove(const QDomElement& xml, const Species* parent, const int id) :
+SpeciesMove::SpeciesMove(const QDomElement& xml, const Species* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::SpeciesMove::validate()
+void SpeciesMove::validate()
 {
     TEST_BEGIN();
     TEST(move);
@@ -64,7 +66,7 @@ void Sigmod::SpeciesMove::validate()
     TEST_END();
 }
 
-void Sigmod::SpeciesMove::load(const QDomElement& xml)
+void SpeciesMove::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(move);
@@ -72,7 +74,7 @@ void Sigmod::SpeciesMove::load(const QDomElement& xml)
     LOAD(wild);
 }
 
-QDomElement Sigmod::SpeciesMove::save() const
+QDomElement SpeciesMove::save() const
 {
     SAVE_CREATE();
     SAVE(move);
@@ -93,7 +95,7 @@ CHECK_INDEX(SpeciesMove, int, move, sigmod(), move)
 CHECK_BOUNDS(SpeciesMove, int, level, -1, sigmod()->rules()->maxLevel())
 CHECK_BOUNDS(SpeciesMove, int, wild, -1, sigmod()->rules()->maxLevel())
 
-Sigmod::SpeciesMove& Sigmod::SpeciesMove::operator=(const SpeciesMove& rhs)
+SpeciesMove& SpeciesMove::operator=(const SpeciesMove& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Sprite.cpp b/sigmod/Sprite.cpp
index 22a39d23..c555029d 100644
--- a/sigmod/Sprite.cpp
+++ b/sigmod/Sprite.cpp
@@ -26,33 +26,35 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Sprite::Sprite(const Sprite& sprite) :
+using namespace Sigmod;
+
+Sprite::Sprite(const Sprite& sprite) :
         Object(sprite.parent(), sprite.id())
 {
     *this = sprite;
 }
 
-Sigmod::Sprite::Sprite(const Sigmod* parent, const int id) :
+Sprite::Sprite(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_sprite()
 {
 }
 
-Sigmod::Sprite::Sprite(const Sprite& sprite, const Sigmod* parent, const int id) :
+Sprite::Sprite(const Sprite& sprite, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = sprite;
 }
 
-Sigmod::Sprite::Sprite(const QDomElement& xml, const Sigmod* parent, const int id) :
+Sprite::Sprite(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Sprite::validate()
+void Sprite::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -62,14 +64,14 @@ void Sigmod::Sprite::validate()
     TEST_END();
 }
 
-void Sigmod::Sprite::load(const QDomElement& xml)
+void Sprite::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD(sprite);
 }
 
-QDomElement Sigmod::Sprite::save() const
+QDomElement Sprite::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -86,7 +88,7 @@ GETTER(Sprite, QByteArray, sprite)
 CHECK(Sprite, QString&, name)
 CHECK(Sprite, QByteArray&, sprite)
 
-Sigmod::Sprite& Sigmod::Sprite::operator=(const Sprite& rhs)
+Sprite& Sprite::operator=(const Sprite& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Status.cpp b/sigmod/Status.cpp
index 8f546d30..81928ba7 100644
--- a/sigmod/Status.cpp
+++ b/sigmod/Status.cpp
@@ -26,13 +26,16 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Status::Status(const Status& status) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Status::Status(const Status& status) :
         Object(status.parent(), status.id())
 {
     *this = status;
 }
 
-Sigmod::Status::Status(const Sigmod* parent, const int id) :
+Status::Status(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_battleScript("", ""),
@@ -40,20 +43,20 @@ Sigmod::Status::Status(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Status::Status(const Status& status, const Sigmod* parent, const int id) :
+Status::Status(const Status& status, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = status;
 }
 
-Sigmod::Status::Status(const QDomElement& xml, const Sigmod* parent, const int id) :
+Status::Status(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Status::validate()
+void Status::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -61,7 +64,7 @@ void Sigmod::Status::validate()
     TEST_END();
 }
 
-void Sigmod::Status::load(const QDomElement& xml)
+void Status::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -69,7 +72,7 @@ void Sigmod::Status::load(const QDomElement& xml)
     LOAD(worldScript);
 }
 
-QDomElement Sigmod::Status::save() const
+QDomElement Status::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -79,18 +82,18 @@ QDomElement Sigmod::Status::save() const
 }
 
 SETTER(Status, QString&, Name, name)
-SETTER(Status, Sigcore::Script&, BattleScript, battleScript)
-SETTER(Status, Sigcore::Script&, WorldScript, worldScript)
+SETTER(Status, Script&, BattleScript, battleScript)
+SETTER(Status, Script&, WorldScript, worldScript)
 
 GETTER(Status, QString, name)
-GETTER(Status, Sigcore::Script, battleScript)
-GETTER(Status, Sigcore::Script, worldScript)
+GETTER(Status, Script, battleScript)
+GETTER(Status, Script, worldScript)
 
 CHECK(Status, QString&, name)
-CHECK(Status, Sigcore::Script&, battleScript)
-CHECK(Status, Sigcore::Script&, worldScript)
+CHECK(Status, Script&, battleScript)
+CHECK(Status, Script&, worldScript)
 
-Sigmod::Status& Sigmod::Status::operator=(const Status& rhs)
+Status& Status::operator=(const Status& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Store.cpp b/sigmod/Store.cpp
index 58f114f7..aa65228e 100644
--- a/sigmod/Store.cpp
+++ b/sigmod/Store.cpp
@@ -26,32 +26,34 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Store::Store(const Store& store) :
+using namespace Sigmod;
+
+Store::Store(const Store& store) :
         Object(store.parent(), store.id())
 {
     *this = store;
 }
 
-Sigmod::Store::Store(const Sigmod* parent, const int id) :
+Store::Store(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name("")
 {
 }
 
-Sigmod::Store::Store(const Store& store, const Sigmod* parent, const int id) :
+Store::Store(const Store& store, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = store;
 }
 
-Sigmod::Store::Store(const QDomElement& xml, const Sigmod* parent, const int id) :
+Store::Store(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Store::validate()
+void Store::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -63,14 +65,14 @@ void Sigmod::Store::validate()
     TEST_END();
 }
 
-void Sigmod::Store::load(const QDomElement& xml)
+void Store::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD_LIST(item);
 }
 
-QDomElement Sigmod::Store::save() const
+QDomElement Store::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -87,7 +89,7 @@ GETTER_LIST(Store, item)
 CHECK(Store, QString&, name)
 CHECK_INDEX(Store, int, item, sigmod(), item)
 
-Sigmod::Store& Sigmod::Store::operator=(const Store& rhs)
+Store& Store::operator=(const Store& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -97,7 +99,7 @@ Sigmod::Store& Sigmod::Store::operator=(const Store& rhs)
     return *this;
 }
 
-void Sigmod::Store::clear()
+void Store::clear()
 {
     m_item.clear();
 }
diff --git a/sigmod/Tile.cpp b/sigmod/Tile.cpp
index 44cc5f9f..18cc0ba5 100644
--- a/sigmod/Tile.cpp
+++ b/sigmod/Tile.cpp
@@ -26,13 +26,16 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Tile::Tile(const Tile& tile) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Tile::Tile(const Tile& tile) :
         Object(tile.parent(), tile.id())
 {
     *this = tile;
 }
 
-Sigmod::Tile::Tile(const Sigmod* parent, const int id) :
+Tile::Tile(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_walkable(true),
@@ -40,20 +43,20 @@ Sigmod::Tile::Tile(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Tile::Tile(const Tile& tile, const Sigmod* parent, const int id) :
+Tile::Tile(const Tile& tile, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = tile;
 }
 
-Sigmod::Tile::Tile(const QDomElement& xml, const Sigmod* parent, const int id) :
+Tile::Tile(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Tile::validate()
+void Tile::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -61,7 +64,7 @@ void Sigmod::Tile::validate()
     TEST_END();
 }
 
-void Sigmod::Tile::load(const QDomElement& xml)
+void Tile::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -69,7 +72,7 @@ void Sigmod::Tile::load(const QDomElement& xml)
     LOAD(script);
 }
 
-QDomElement Sigmod::Tile::save() const
+QDomElement Tile::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -80,17 +83,17 @@ QDomElement Sigmod::Tile::save() const
 
 SETTER(Tile, QString&, Name, name)
 SETTER(Tile, bool, Walkable, walkable)
-SETTER(Tile, Sigcore::Script&, Script, script)
+SETTER(Tile, Script&, Script, script)
 
 GETTER(Tile, QString, name)
 GETTER(Tile, bool, walkable)
-GETTER(Tile, Sigcore::Script, script)
+GETTER(Tile, Script, script)
 
 CHECK(Tile, QString&, name)
 CHECK(Tile, bool, walkable)
-CHECK(Tile, Sigcore::Script&, script)
+CHECK(Tile, Script&, script)
 
-Sigmod::Tile& Sigmod::Tile::operator=(const Tile& rhs)
+Tile& Tile::operator=(const Tile& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Time.cpp b/sigmod/Time.cpp
index b5fa7a46..c5b5c225 100644
--- a/sigmod/Time.cpp
+++ b/sigmod/Time.cpp
@@ -26,13 +26,16 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Time::Time(const Time& time) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Time::Time(const Time& time) :
         Object(time.parent(), time.id())
 {
     *this = time;
 }
 
-Sigmod::Time::Time(const Sigmod* parent, const int id) :
+Time::Time(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_hour(0),
@@ -41,20 +44,20 @@ Sigmod::Time::Time(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Time::Time(const Time& time, const Sigmod* parent, const int id) :
+Time::Time(const Time& time, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = time;
 }
 
-Sigmod::Time::Time(const QDomElement& xml, const Sigmod* parent, const int id) :
+Time::Time(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Time::validate()
+void Time::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -64,7 +67,7 @@ void Sigmod::Time::validate()
     TEST_END();
 }
 
-void Sigmod::Time::load(const QDomElement& xml)
+void Time::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -73,7 +76,7 @@ void Sigmod::Time::load(const QDomElement& xml)
     LOAD(script);
 }
 
-QDomElement Sigmod::Time::save() const
+QDomElement Time::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -86,19 +89,19 @@ QDomElement Sigmod::Time::save() const
 SETTER(Time, QString&, Name, name)
 SETTER(Time, int, Hour, hour)
 SETTER(Time, int, Minute, minute)
-SETTER(Time, Sigcore::Script&, Script, script)
+SETTER(Time, Script&, Script, script)
 
 GETTER(Time, QString, name)
 GETTER(Time, int, hour)
 GETTER(Time, int, minute)
-GETTER(Time, Sigcore::Script, script)
+GETTER(Time, Script, script)
 
 CHECK(Time, QString&, name)
 CHECK_BOUNDS(Time, int, hour, 0, 23)
 CHECK_BOUNDS(Time, int, minute, 0, 59)
-CHECK(Time, Sigcore::Script&, script)
+CHECK(Time, Script&, script)
 
-Sigmod::Time& Sigmod::Time::operator=(const Time& rhs)
+Time& Time::operator=(const Time& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Trainer.cpp b/sigmod/Trainer.cpp
index cd91a511..4a12f017 100644
--- a/sigmod/Trainer.cpp
+++ b/sigmod/Trainer.cpp
@@ -26,15 +26,18 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-const QStringList Sigmod::Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Cheating";
+using namespace Sigcore;
+using namespace Sigmod;
 
-Sigmod::Trainer::Trainer(const Trainer& trainer) :
+const QStringList Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Cheating";
+
+Trainer::Trainer(const Trainer& trainer) :
         Object(trainer.parent(), trainer.id())
 {
     *this = trainer;
 }
 
-Sigmod::Trainer::Trainer(const Sigmod* parent, const int id) :
+Trainer::Trainer(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_moneyFactor(0),
@@ -48,20 +51,20 @@ Sigmod::Trainer::Trainer(const Sigmod* parent, const int id) :
 {
 }
 
-Sigmod::Trainer::Trainer(const Trainer& trainer, const Sigmod* parent, const int id) :
+Trainer::Trainer(const Trainer& trainer, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = trainer;
 }
 
-Sigmod::Trainer::Trainer(const QDomElement& xml, const Sigmod* parent, const int id) :
+Trainer::Trainer(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Trainer::validate()
+void Trainer::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -72,7 +75,7 @@ void Sigmod::Trainer::validate()
     TEST_END();
 }
 
-void Sigmod::Trainer::load(const QDomElement& xml)
+void Trainer::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
@@ -86,7 +89,7 @@ void Sigmod::Trainer::load(const QDomElement& xml)
     LOAD_ENUM(statIntel, Intelligence);
 }
 
-QDomElement Sigmod::Trainer::save() const
+QDomElement Trainer::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -115,11 +118,11 @@ GETTER(Trainer, QString, name)
 GETTER(Trainer, int, moneyFactor)
 GETTER(Trainer, int, skin)
 GETTER(Trainer, int, depth)
-GETTER(Trainer, Sigmod::Trainer::Intelligence, teamIntel)
-GETTER(Trainer, Sigmod::Trainer::Intelligence, moveIntel)
-GETTER(Trainer, Sigmod::Trainer::Intelligence, itemIntel)
-GETTER(Trainer, Sigmod::Trainer::Intelligence, abilityIntel)
-GETTER(Trainer, Sigmod::Trainer::Intelligence, statIntel)
+GETTER(Trainer, Trainer::Intelligence, teamIntel)
+GETTER(Trainer, Trainer::Intelligence, moveIntel)
+GETTER(Trainer, Trainer::Intelligence, itemIntel)
+GETTER(Trainer, Trainer::Intelligence, abilityIntel)
+GETTER(Trainer, Trainer::Intelligence, statIntel)
 
 CHECK(Trainer, QString&, name)
 CHECK_BOUNDS(Trainer, int, moneyFactor, 0, INT_MAX)
@@ -131,7 +134,7 @@ CHECK(Trainer, Intelligence, itemIntel)
 CHECK(Trainer, Intelligence, abilityIntel)
 CHECK(Trainer, Intelligence, statIntel)
 
-Sigmod::Trainer& Sigmod::Trainer::operator=(const Trainer& rhs)
+Trainer& Trainer::operator=(const Trainer& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Type.cpp b/sigmod/Type.cpp
index bbe7e950..935aeb4e 100644
--- a/sigmod/Type.cpp
+++ b/sigmod/Type.cpp
@@ -26,33 +26,36 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Type::Type(const Type& type) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Type::Type(const Type& type) :
         Object(type.parent(), type.id())
 {
     *this = type;
 }
 
-Sigmod::Type::Type(const Sigmod* parent, const int id) :
+Type::Type(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_stab(1, 1)
 {
 }
 
-Sigmod::Type::Type(const Type& type, const Sigmod* parent, const int id) :
+Type::Type(const Type& type, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = type;
 }
 
-Sigmod::Type::Type(const QDomElement& xml, const Sigmod* parent, const int id) :
+Type::Type(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Type::validate()
+void Type::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -61,14 +64,14 @@ void Sigmod::Type::validate()
     TEST_END();
 }
 
-void Sigmod::Type::load(const QDomElement& xml)
+void Type::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD(stab);
 }
 
-QDomElement Sigmod::Type::save() const
+QDomElement Type::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -77,15 +80,15 @@ QDomElement Sigmod::Type::save() const
 }
 
 SETTER(Type, QString&, Name, name)
-SETTER(Type, Sigcore::Fraction&, Stab, stab)
+SETTER(Type, Fraction&, Stab, stab)
 
 GETTER(Type, QString, name)
-GETTER(Type, Sigcore::Fraction, stab)
+GETTER(Type, Fraction, stab)
 
 CHECK(Type, QString&, name)
-CHECK_BOUNDS(Type, Sigcore::Fraction&, stab, 1, INT_MAX)
+CHECK_BOUNDS(Type, Fraction&, stab, 1, INT_MAX)
 
-Sigmod::Type& Sigmod::Type::operator=(const Type& rhs)
+Type& Type::operator=(const Type& rhs)
 {
     if (this == &rhs)
         return *this;
diff --git a/sigmod/Weather.cpp b/sigmod/Weather.cpp
index 9b96317b..8cee3acd 100644
--- a/sigmod/Weather.cpp
+++ b/sigmod/Weather.cpp
@@ -26,33 +26,36 @@
 #include "Macros.h"
 #include "Sigmod.h"
 
-Sigmod::Weather::Weather(const Weather& weather) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Weather::Weather(const Weather& weather) :
         Object(weather.parent(), weather.id())
 {
     *this = weather;
 }
 
-Sigmod::Weather::Weather(const Sigmod* parent, const int id) :
+Weather::Weather(const Sigmod* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_script("", "")
 {
 }
 
-Sigmod::Weather::Weather(const Weather& weather, const Sigmod* parent, const int id) :
+Weather::Weather(const Weather& weather, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     *this = weather;
 }
 
-Sigmod::Weather::Weather(const QDomElement& xml, const Sigmod* parent, const int id) :
+Weather::Weather(const QDomElement& xml, const Sigmod* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::Weather::validate()
+void Weather::validate()
 {
     TEST_BEGIN();
     if (m_name.isEmpty())
@@ -60,14 +63,14 @@ void Sigmod::Weather::validate()
     TEST_END();
 }
 
-void Sigmod::Weather::load(const QDomElement& xml)
+void Weather::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
     LOAD(script);
 }
 
-QDomElement Sigmod::Weather::save() const
+QDomElement Weather::save() const
 {
     SAVE_CREATE();
     SAVE(name);
@@ -76,15 +79,15 @@ QDomElement Sigmod::Weather::save() const
 }
 
 SETTER(Weather, QString&, Name, name)
-SETTER(Weather, Sigcore::Script&, Script, script)
+SETTER(Weather, Script&, Script, script)
 
 GETTER(Weather, QString, name)
-GETTER(Weather, Sigcore::Script, script)
+GETTER(Weather, Script, script)
 
 CHECK(Weather, QString&, name)
-CHECK(Weather, Sigcore::Script&, script)
+CHECK(Weather, Script&, script)
 
-Sigmod::Weather& Sigmod::Weather::operator=(const Weather& rhs)
+Weather& Weather::operator=(const Weather& rhs)
 {
     if (this == &rhs)
         return *this;