9 files changed, 88 insertions, 61 deletions
diff --git a/src/encoderB64.cpp b/src/utility/encoder/b64Encoder.cpp
index 2c16ee75..c4ba2b39 100644
--- a/src/encoderB64.cpp
+++ b/src/utility/encoder/b64Encoder.cpp
@@ -21,20 +21,21 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoderB64.hpp"
+#include "vmime/utility/encoder/b64Encoder.hpp"
 #include "vmime/parserHelpers.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoderB64::encoderB64()
+b64Encoder::b64Encoder()
 {
 }
 
 
-const std::vector <string> encoderB64::getAvailableProperties() const
+const std::vector <string> b64Encoder::getAvailableProperties() const
 {
 	std::vector <string> list(encoder::getAvailableProperties());
 
@@ -45,10 +46,10 @@ const std::vector <string> encoderB64::getAvailableProperties() const
 
 
 // 7-bits alphabet used to encode binary data
-const unsigned char encoderB64::sm_alphabet[] =
+const unsigned char b64Encoder::sm_alphabet[] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
-const unsigned char encoderB64::sm_decodeMap[256] =
+const unsigned char b64Encoder::sm_decodeMap[256] =
 {
 	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,  // 0x00 - 0x0f
 	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,  // 0x10 - 0x1f
@@ -74,7 +75,7 @@ const unsigned char encoderB64::sm_decodeMap[256] =
 
 
 
-utility::stream::size_type encoderB64::encode(utility::inputStream& in,
+utility::stream::size_type b64Encoder::encode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -189,7 +190,7 @@ utility::stream::size_type encoderB64::encode(utility::inputStream& in,
 }
 
 
-utility::stream::size_type encoderB64::decode(utility::inputStream& in,
+utility::stream::size_type b64Encoder::decode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -302,4 +303,6 @@ utility::stream::size_type encoderB64::decode(utility::inputStream& in,
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoder7bit.cpp b/src/utility/encoder/binaryEncoder.cpp
index 4a60950f..2bc77d27 100644
--- a/src/encoder7bit.cpp
+++ b/src/utility/encoder/binaryEncoder.cpp
@@ -21,16 +21,19 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoder7bit.hpp"
+#include "vmime/utility/encoder/binaryEncoder.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoder7bit::encoder7bit()
+binaryEncoder::binaryEncoder()
 {
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoderDefault.cpp b/src/utility/encoder/defaultEncoder.cpp
index 1f2ba859..db833c85 100644
--- a/src/encoderDefault.cpp
+++ b/src/utility/encoder/defaultEncoder.cpp
@@ -21,19 +21,20 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoderDefault.hpp"
+#include "vmime/utility/encoder/defaultEncoder.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoderDefault::encoderDefault()
+defaultEncoder::defaultEncoder()
 {
 }
 
 
-utility::stream::size_type encoderDefault::encode(utility::inputStream& in,
+utility::stream::size_type defaultEncoder::encode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -50,7 +51,7 @@ utility::stream::size_type encoderDefault::encode(utility::inputStream& in,
 }
 
 
-utility::stream::size_type encoderDefault::decode(utility::inputStream& in,
+utility::stream::size_type defaultEncoder::decode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -67,4 +68,6 @@ utility::stream::size_type encoderDefault::decode(utility::inputStream& in,
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoder8bit.cpp b/src/utility/encoder/eightBitEncoder.cpp
index c85a3804..88f07bc4 100644
--- a/src/encoder8bit.cpp
+++ b/src/utility/encoder/eightBitEncoder.cpp
@@ -21,16 +21,19 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoder8bit.hpp"
+#include "vmime/utility/encoder/eightBitEncoder.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoder8bit::encoder8bit()
+eightBitEncoder::eightBitEncoder()
 {
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoder.cpp b/src/utility/encoder/encoder.cpp
index 38c7764a..893ed4fc 100644
--- a/src/encoder.cpp
+++ b/src/utility/encoder/encoder.cpp
@@ -21,12 +21,13 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoder.hpp"
+#include "vmime/utility/encoder/encoder.hpp"
 #include "vmime/exception.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
 encoder::encoder()
@@ -70,4 +71,6 @@ const std::vector <string> encoder::getAvailableProperties() const
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoderFactory.cpp b/src/utility/encoder/encoderFactory.cpp
index 605286be..9d7c1070 100644
--- a/src/encoderFactory.cpp
+++ b/src/utility/encoder/encoderFactory.cpp
@@ -21,30 +21,31 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoderFactory.hpp"
+#include "vmime/utility/encoder/encoderFactory.hpp"
 #include "vmime/exception.hpp"
 
-#include "vmime/encoderB64.hpp"
-#include "vmime/encoderQP.hpp"
-#include "vmime/encoderUUE.hpp"
-#include "vmime/encoderBinary.hpp"
-#include "vmime/encoder7bit.hpp"
-#include "vmime/encoder8bit.hpp"
+#include "vmime/utility/encoder/b64Encoder.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
+#include "vmime/utility/encoder/uuEncoder.hpp"
+#include "vmime/utility/encoder/binaryEncoder.hpp"
+#include "vmime/utility/encoder/sevenBitEncoder.hpp"
+#include "vmime/utility/encoder/eightBitEncoder.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
 encoderFactory::encoderFactory()
 {
 	// Register some default encoders
-	registerName <encoderB64>("base64");
-	registerName <encoderQP>("quoted-printable");
-	registerName <encoderUUE>("uuencode");
-	registerName <encoder7bit>("7bit");
-	registerName <encoder8bit>("8bit");
-	registerName <encoderBinary>("binary");
+	registerName <b64Encoder>("base64");
+	registerName <qpEncoder>("quoted-printable");
+	registerName <uuEncoder>("uuencode");
+	registerName <sevenBitEncoder>("7bit");
+	registerName <eightBitEncoder>("8bit");
+	registerName <binaryEncoder>("binary");
 }
 
 
@@ -107,4 +108,6 @@ const std::vector <ref <const encoderFactory::registeredEncoder> > encoderFactor
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoderQP.cpp b/src/utility/encoder/qpEncoder.cpp
index 95ca331c..737d488a 100644
--- a/src/encoderQP.cpp
+++ b/src/utility/encoder/qpEncoder.cpp
@@ -21,20 +21,21 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoderQP.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
 #include "vmime/parserHelpers.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoderQP::encoderQP()
+qpEncoder::qpEncoder()
 {
 }
 
 
-const std::vector <string> encoderQP::getAvailableProperties() const
+const std::vector <string> qpEncoder::getAvailableProperties() const
 {
 	std::vector <string> list(encoder::getAvailableProperties());
 
@@ -51,10 +52,10 @@ const std::vector <string> encoderQP::getAvailableProperties() const
 
 
 // Encoding table
-const unsigned char encoderQP::sm_hexDigits[] = "0123456789ABCDEF";
+const unsigned char qpEncoder::sm_hexDigits[] = "0123456789ABCDEF";
 
 // Decoding table
-const unsigned char encoderQP::sm_hexDecodeTable[256] =
+const unsigned char qpEncoder::sm_hexDecodeTable[256] =
 {
 	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -89,7 +90,7 @@ const unsigned char encoderQP::sm_hexDecodeTable[256] =
 #endif // VMIME_BUILDING_DOC
 
 
-utility::stream::size_type encoderQP::encode(utility::inputStream& in,
+utility::stream::size_type qpEncoder::encode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -305,7 +306,7 @@ utility::stream::size_type encoderQP::encode(utility::inputStream& in,
 }
 
 
-utility::stream::size_type encoderQP::decode(utility::inputStream& in,
+utility::stream::size_type qpEncoder::decode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -466,4 +467,6 @@ utility::stream::size_type encoderQP::decode(utility::inputStream& in,
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoderBinary.cpp b/src/utility/encoder/sevenBitEncoder.cpp
index dd77b072..812afa90 100644
--- a/src/encoderBinary.cpp
+++ b/src/utility/encoder/sevenBitEncoder.cpp
@@ -21,16 +21,19 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoderBinary.hpp"
+#include "vmime/utility/encoder/sevenBitEncoder.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoderBinary::encoderBinary()
+sevenBitEncoder::sevenBitEncoder()
 {
 }
 
 
+} // encoder
+} // utility
 } // vmime
diff --git a/src/encoderUUE.cpp b/src/utility/encoder/uuEncoder.cpp
index ed54ffa7..0e72599b 100644
--- a/src/encoderUUE.cpp
+++ b/src/utility/encoder/uuEncoder.cpp
@@ -21,15 +21,16 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/encoderUUE.hpp"
+#include "vmime/utility/encoder/uuEncoder.hpp"
 #include "vmime/parserHelpers.hpp"
 
 
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
 
 
-encoderUUE::encoderUUE()
+uuEncoder::uuEncoder()
 {
 	getProperties()["mode"] = 644;
 	getProperties()["filename"] = "no_name";
@@ -37,7 +38,7 @@ encoderUUE::encoderUUE()
 }
 
 
-const std::vector <string> encoderUUE::getAvailableProperties() const
+const std::vector <string> uuEncoder::getAvailableProperties() const
 {
 	std::vector <string> list(encoder::getAvailableProperties());
 
@@ -63,7 +64,7 @@ static inline unsigned char UUDECODE(const unsigned char c)
 }
 
 
-utility::stream::size_type encoderUUE::encode(utility::inputStream& in,
+utility::stream::size_type uuEncoder::encode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -142,7 +143,7 @@ utility::stream::size_type encoderUUE::encode(utility::inputStream& in,
 }
 
 
-utility::stream::size_type encoderUUE::decode(utility::inputStream& in,
+utility::stream::size_type uuEncoder::decode(utility::inputStream& in,
 	utility::outputStream& out, utility::progressListener* progress)
 {
 	in.reset();  // may not work...
@@ -325,4 +326,6 @@ utility::stream::size_type encoderUUE::decode(utility::inputStream& in,
 }
 
 
+} // encoder
+} // utility
 } // vmime