diff --git a/lib/OSRIC/Classes.pm b/lib/OSRIC/Class.pm
similarity index 67%
rename from lib/OSRIC/Classes.pm
rename to lib/OSRIC/Class.pm
index fe70e35..841fa34 100644
--- a/lib/OSRIC/Classes.pm
+++ b/lib/OSRIC/Class.pm
@@ -1,4 +1,8 @@
-package OSRIC::Classes;
+package OSRIC::Class;
+
+# A list of the classes:
+my @CLASSES = qw/Assassin Cleric Druid Fighter Illusionist MagicUser Paladin
+				 Ranger Thief/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
 # an actual amount of starting gold: 
diff --git a/lib/OSRIC/Classes/Assassin.pm b/lib/OSRIC/Class/Assassin.pm
similarity index 84%
rename from lib/OSRIC/Classes/Assassin.pm
rename to lib/OSRIC/Class/Assassin.pm
index 5d1c418..38d0ecb 100644
--- a/lib/OSRIC/Classes/Assassin.pm
+++ b/lib/OSRIC/Class/Assassin.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Assassin;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Assassin;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Cleric.pm b/lib/OSRIC/Class/Cleric.pm
similarity index 85%
rename from lib/OSRIC/Classes/Cleric.pm
rename to lib/OSRIC/Class/Cleric.pm
index 88be540..2076c6a 100644
--- a/lib/OSRIC/Classes/Cleric.pm
+++ b/lib/OSRIC/Class/Cleric.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Cleric;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Cleric;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Druid.pm b/lib/OSRIC/Class/Druid.pm
similarity index 85%
rename from lib/OSRIC/Classes/Druid.pm
rename to lib/OSRIC/Class/Druid.pm
index b1e5fc6..131016b 100644
--- a/lib/OSRIC/Classes/Druid.pm
+++ b/lib/OSRIC/Class/Druid.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Druid;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Druid;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Fighter.pm b/lib/OSRIC/Class/Fighter.pm
similarity index 85%
rename from lib/OSRIC/Classes/Fighter.pm
rename to lib/OSRIC/Class/Fighter.pm
index b666914..142c47b 100644
--- a/lib/OSRIC/Classes/Fighter.pm
+++ b/lib/OSRIC/Class/Fighter.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Fighter;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Fighter;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Illusionist.pm b/lib/OSRIC/Class/Illusionist.pm
similarity index 84%
rename from lib/OSRIC/Classes/Illusionist.pm
rename to lib/OSRIC/Class/Illusionist.pm
index 1bb1d48..59e74ff 100644
--- a/lib/OSRIC/Classes/Illusionist.pm
+++ b/lib/OSRIC/Class/Illusionist.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Illusionist;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Illusionist;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/MagicUser.pm b/lib/OSRIC/Class/MagicUser.pm
similarity index 84%
rename from lib/OSRIC/Classes/MagicUser.pm
rename to lib/OSRIC/Class/MagicUser.pm
index 285f0d8..3fb4318 100644
--- a/lib/OSRIC/Classes/MagicUser.pm
+++ b/lib/OSRIC/Class/MagicUser.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::MagicUser;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::MagicUser;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Paladin.pm b/lib/OSRIC/Class/Paladin.pm
similarity index 85%
rename from lib/OSRIC/Classes/Paladin.pm
rename to lib/OSRIC/Class/Paladin.pm
index 275e37c..4e9f4f3 100644
--- a/lib/OSRIC/Classes/Paladin.pm
+++ b/lib/OSRIC/Class/Paladin.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Paladin;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Paladin;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Ranger.pm b/lib/OSRIC/Class/Ranger.pm
similarity index 85%
rename from lib/OSRIC/Classes/Ranger.pm
rename to lib/OSRIC/Class/Ranger.pm
index 8afd6ba..c8fbce0 100644
--- a/lib/OSRIC/Classes/Ranger.pm
+++ b/lib/OSRIC/Class/Ranger.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Ranger;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Ranger;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get
diff --git a/lib/OSRIC/Classes/Thief.pm b/lib/OSRIC/Class/Thief.pm
similarity index 85%
rename from lib/OSRIC/Classes/Thief.pm
rename to lib/OSRIC/Class/Thief.pm
index 3b7a0e9..17e5c90 100644
--- a/lib/OSRIC/Classes/Thief.pm
+++ b/lib/OSRIC/Class/Thief.pm
@@ -1,5 +1,5 @@
-package OSRIC::Classes::Thief;
-use parent qw(OSRIC::Classes);
+package OSRIC::Class::Thief;
+use parent qw(OSRIC::Class);
 use OSRIC::Util qw/d/;
 
 # A sub to get the maximum amount of starting gold (for sorting) and one to get