--- a/C++/modules/Base64/Base64.cpp	Mon Sep 28 13:18:14 2015 +0200
+++ b/C++/modules/Base64/Base64.cpp	Mon Sep 28 15:16:31 2015 +0200
@@ -21,14 +21,16 @@
 
 #include "Base64.h"
 
-char Base64::lookup(int value) noexcept
+namespace base64 {
+
+char lookup(int value) noexcept
 {
 	static const char table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 	return table[value];
 }
 
-int Base64::rlookup(char ch)
+int rlookup(char ch)
 {
 	if (ch == '+')
 		return 62;
@@ -45,7 +47,7 @@
 	throw std::invalid_argument("not a valid base64 string");
 }
 
-std::string Base64::encode(const std::string &input)
+std::string encode(const std::string &input)
 {
 	std::string result;
 	std::istringstream iss(input, std::istringstream::in);
@@ -55,7 +57,7 @@
 	return result;
 }
 
-std::string Base64::decode(const std::string &input)
+std::string decode(const std::string &input)
 {
 	std::string result;
 	std::istringstream iss(input, std::istringstream::in);
@@ -63,4 +65,6 @@
 	decode(std::istreambuf_iterator<char>(iss), std::istreambuf_iterator<char>(), std::back_inserter(result));
 
 	return result;
-}
\ No newline at end of file
+}
+
+} // !base64