diff --git a/README.md b/README.md
index 59bd20c..60d5d3b 100755
--- a/README.md
+++ b/README.md
@@ -27,13 +27,13 @@ Installation
 
 -   using composer: add "wa72/simplelogger": "dev-master" to the "require" section of your composer.json
 
--   Without composer: just include the logger you need: Wa72FileLogger.php, Wa72ArrayLogger.php or Wa72ConsoleLogger.php
+-   Without composer: just include the logger you need: FileLogger.php, ArrayLogger.php or ConsoleLogger.php
 
 
 Usage
 -----
 
 ```php
-$logger = new \Wa72FileLogger('/path/to/logfile');
+$logger = new \Wa72\SimpleLogger\FileLogger('/path/to/logfile');
 $logger->info('This is the first log message');
 ```
diff --git a/Wa72ArrayLogger.php b/Wa72/SimpleLogger/ArrayLogger.php
similarity index 96%
rename from Wa72ArrayLogger.php
rename to Wa72/SimpleLogger/ArrayLogger.php
index c1f7e13..e07101d 100755
--- a/Wa72ArrayLogger.php
+++ b/Wa72/SimpleLogger/ArrayLogger.php
@@ -1,7 +1,8 @@
 <?php
+namespace Wa72\SimpleLogger;
 use Psr\Log\AbstractLogger;
 
-class Wa72ArrayLogger extends AbstractLogger
+class ArrayLogger extends AbstractLogger
 {
     protected $memory = array();
 
diff --git a/Wa72ConsoleLogger.php b/Wa72/SimpleLogger/ConsoleLogger.php
similarity index 89%
rename from Wa72ConsoleLogger.php
rename to Wa72/SimpleLogger/ConsoleLogger.php
index 551f036..c3385c6 100755
--- a/Wa72ConsoleLogger.php
+++ b/Wa72/SimpleLogger/ConsoleLogger.php
@@ -1,8 +1,9 @@
 <?php
+namespace Wa72\SimpleLogger;
 use Psr\Log\AbstractLogger;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Wa72ConsoleLogger extends AbstractLogger {
+class ConsoleLogger extends AbstractLogger {
     /**
      * @var \Symfony\Component\Console\Output\OutputInterface
      */
diff --git a/Wa72FileLogger.php b/Wa72/SimpleLogger/FileLogger.php
similarity index 95%
rename from Wa72FileLogger.php
rename to Wa72/SimpleLogger/FileLogger.php
index cba811f..65d8be2 100755
--- a/Wa72FileLogger.php
+++ b/Wa72/SimpleLogger/FileLogger.php
@@ -6,7 +6,8 @@
  * @author Christoph Singer
  * @license MIT
  */
-class Wa72FileLogger extends \Psr\Log\AbstractLogger
+namespace Wa72\SimpleLogger;
+class FileLogger extends \Psr\Log\AbstractLogger
 {
     protected $logfile;
 
diff --git a/Wa72SimpleLogger.php b/Wa72SimpleLogger.php
index 9999031..bb3ae81 100755
--- a/Wa72SimpleLogger.php
+++ b/Wa72SimpleLogger.php
@@ -1,13 +1,14 @@
 <?php
+require (__DIR__ . '/Wa72/SimpleLogger/FileLogger.php');
 /**
  * This class is a very, very simple file logger implementing \Psr\Log\LoggerInterface (PSR-3).
- * It is now called Wa72FileLogger and the deprecated class Wa72SimpleLogger is kept only for compatibility.
+ * It is now called \Wa72\SimpleLogger\FileLogger and the deprecated class Wa72SimpleLogger is kept only for compatibility.
  * 
  * @author Christoph Singer
  * @license MIT
  * @deprecated
- * @see Wa72FileLogger
+ * @see Wa72\SimpleLogger\FileLogger
  */
-class Wa72SimpleLogger extends Wa72FileLogger
+class Wa72SimpleLogger extends \Wa72\SimpleLogger\FileLogger
 {
 }
diff --git a/composer.json b/composer.json
index 75444cb..202505e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     },
     "autoload":{
         "psr-0":{
-            "Wa72SimpleLogger":""
+            "Wa72\\SimpleLogger":"."
         }
     }
 }