diff --git a/include/Utils/socket_stream.hpp b/include/io/socket_stream.hpp
similarity index 99%
rename from include/Utils/socket_stream.hpp
rename to include/io/socket_stream.hpp
index eeb91ba0..f99fdc14 100644
--- a/include/Utils/socket_stream.hpp
+++ b/include/io/socket_stream.hpp
@@ -38,6 +38,8 @@
 
 namespace Arabica
 {
+namespace io
+{
 
 ///////////////////////////////////////////////////////////
 // basic_socketbuf declaration
@@ -429,6 +431,7 @@ typedef basic_socketbuf<wchar_t, std::char_traits<wchar_t> > wsocketbuf;
 typedef basic_socketstream<wchar_t, std::char_traits<wchar_t> > wsocketstream;
 #endif
 
+} // namespace io
 } // namespace Arabica
 
 #endif
diff --git a/src/SAX/helpers/InputSourceResolver.cpp b/src/SAX/helpers/InputSourceResolver.cpp
index a10c028b..82243c96 100644
--- a/src/SAX/helpers/InputSourceResolver.cpp
+++ b/src/SAX/helpers/InputSourceResolver.cpp
@@ -9,7 +9,7 @@
 #include <SAX/helpers/InputSourceResolver.hpp>
 #include <istream>
 #include <fstream>
-#include <Utils/socket_stream.hpp>
+#include <io/socket_stream.hpp>
 #include <io/uri.hpp>
 #include <cmath>
 
@@ -123,7 +123,7 @@ namespace
 
     Arabica::io::URI url(httpURI);
 
-    Arabica::socketstream* ifs = new Arabica::socketstream(url.host().c_str(), std::atoi(url.port().c_str()));
+    Arabica::io::socketstream* ifs = new Arabica::io::socketstream(url.host().c_str(), std::atoi(url.port().c_str()));
     if(!ifs->is_open())
       return 0;
     *ifs << "GET " << url.path() << " HTTP/1.0" << std::endl;