15 files changed, 19 insertions, 22 deletions
diff --git a/TwoFactorAuth.phpproj b/TwoFactorAuth.phpproj
index c9af078..6ad3e53 100644
--- a/TwoFactorAuth.phpproj
+++ b/TwoFactorAuth.phpproj
@@ -24,28 +24,27 @@
   <ItemGroup>
     <Compile Include="demo.php" />
     <Compile Include="loader.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Qr\BaseHTTPQRCodeProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Qr\GoogleQRCodeProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Qr\IQRCodeProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Qr\QRException.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Qr\QRicketProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Qr\QRServerProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Rng\IRNGProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Rng\MCryptRNGProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Rng\OpenSSLRNGProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Rng\HashRNGProvider.php" />
-    <Compile Include="RobThree\TwoFactorAuth\Providers\Rng\RNGException.php" />
-    <Compile Include="RobThree\TwoFactorAuth\TwoFactorAuth.php" />
+    <Compile Include="lib\Providers\Qr\BaseHTTPQRCodeProvider.php" />
+    <Compile Include="lib\Providers\Qr\GoogleQRCodeProvider.php" />
+    <Compile Include="lib\Providers\Qr\IQRCodeProvider.php" />
+    <Compile Include="lib\Providers\Qr\QRException.php" />
+    <Compile Include="lib\Providers\Qr\QRicketProvider.php" />
+    <Compile Include="lib\Providers\Qr\QRServerProvider.php" />
+    <Compile Include="lib\Providers\Rng\IRNGProvider.php" />
+    <Compile Include="lib\Providers\Rng\MCryptRNGProvider.php" />
+    <Compile Include="lib\Providers\Rng\OpenSSLRNGProvider.php" />
+    <Compile Include="lib\Providers\Rng\HashRNGProvider.php" />
+    <Compile Include="lib\Providers\Rng\RNGException.php" />
+    <Compile Include="lib\TwoFactorAuth.php" />
     <Compile Include=".gitignore" />
     <Compile Include="README.md" />
-    <Compile Include="RobThree\TwoFactorAuth\TwoFactorAuthException.php" />
+    <Compile Include="lib\TwoFactorAuthException.php" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="RobThree\" />
-    <Folder Include="RobThree\TwoFactorAuth\" />
-    <Folder Include="RobThree\TwoFactorAuth\Providers\" />
-    <Folder Include="RobThree\TwoFactorAuth\Providers\Rng\" />
-    <Folder Include="RobThree\TwoFactorAuth\Providers\Qr\" />
+    <Folder Include="lib\" />
+    <Folder Include="lib\Providers\" />
+    <Folder Include="lib\Providers\Qr\" />
+    <Folder Include="lib\Providers\Rng\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="composer.json" />
diff --git a/composer.json b/composer.json
index a309636..06d92e0 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,8 @@
         "source": "https://github.com/RobThree/TwoFactorAuth"
     },
     "autoload": {
-		"psr-4": {
-			"RobThree\\TwoFactorAuth\\": ""
-		}
-	},
+        "psr-0": { "RobThree\\TwoFactorAuth\\": "lib/" }
+    },
     "require": {
         "php": ">=5.3.0"
     }
diff --git a/RobThree/TwoFactorAuth/Providers/Qr/BaseHTTPQRCodeProvider.php b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
index 7cf2d82..7cf2d82 100644
--- a/RobThree/TwoFactorAuth/Providers/Qr/BaseHTTPQRCodeProvider.php
+++ b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Qr/GoogleQRCodeProvider.php b/lib/Providers/Qr/GoogleQRCodeProvider.php
index 02ab3be..02ab3be 100644
--- a/RobThree/TwoFactorAuth/Providers/Qr/GoogleQRCodeProvider.php
+++ b/lib/Providers/Qr/GoogleQRCodeProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Qr/IQRCodeProvider.php b/lib/Providers/Qr/IQRCodeProvider.php
index 8a0840a..8a0840a 100644
--- a/RobThree/TwoFactorAuth/Providers/Qr/IQRCodeProvider.php
+++ b/lib/Providers/Qr/IQRCodeProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Qr/QRException.php b/lib/Providers/Qr/QRException.php
index 6adf084..6adf084 100644
--- a/RobThree/TwoFactorAuth/Providers/Qr/QRException.php
+++ b/lib/Providers/Qr/QRException.php
diff --git a/RobThree/TwoFactorAuth/Providers/Qr/QRServerProvider.php b/lib/Providers/Qr/QRServerProvider.php
index 8bf92cc..8bf92cc 100644
--- a/RobThree/TwoFactorAuth/Providers/Qr/QRServerProvider.php
+++ b/lib/Providers/Qr/QRServerProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Qr/QRicketProvider.php b/lib/Providers/Qr/QRicketProvider.php
index bcd5e89..bcd5e89 100644
--- a/RobThree/TwoFactorAuth/Providers/Qr/QRicketProvider.php
+++ b/lib/Providers/Qr/QRicketProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Rng/HashRNGProvider.php b/lib/Providers/Rng/HashRNGProvider.php
index 645c7dc..645c7dc 100644
--- a/RobThree/TwoFactorAuth/Providers/Rng/HashRNGProvider.php
+++ b/lib/Providers/Rng/HashRNGProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Rng/IRNGProvider.php b/lib/Providers/Rng/IRNGProvider.php
index 44bb9d5..44bb9d5 100644
--- a/RobThree/TwoFactorAuth/Providers/Rng/IRNGProvider.php
+++ b/lib/Providers/Rng/IRNGProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Rng/MCryptRNGProvider.php b/lib/Providers/Rng/MCryptRNGProvider.php
index b97be1a..b97be1a 100644
--- a/RobThree/TwoFactorAuth/Providers/Rng/MCryptRNGProvider.php
+++ b/lib/Providers/Rng/MCryptRNGProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Rng/OpenSSLRNGProvider.php b/lib/Providers/Rng/OpenSSLRNGProvider.php
index 2105136..2105136 100644
--- a/RobThree/TwoFactorAuth/Providers/Rng/OpenSSLRNGProvider.php
+++ b/lib/Providers/Rng/OpenSSLRNGProvider.php
diff --git a/RobThree/TwoFactorAuth/Providers/Rng/RNGException.php b/lib/Providers/Rng/RNGException.php
index 882d7f7..882d7f7 100644
--- a/RobThree/TwoFactorAuth/Providers/Rng/RNGException.php
+++ b/lib/Providers/Rng/RNGException.php
diff --git a/RobThree/TwoFactorAuth/TwoFactorAuth.php b/lib/TwoFactorAuth.php
index 5259eac..5259eac 100644
--- a/RobThree/TwoFactorAuth/TwoFactorAuth.php
+++ b/lib/TwoFactorAuth.php
diff --git a/RobThree/TwoFactorAuth/TwoFactorAuthException.php b/lib/TwoFactorAuthException.php
index 9de9d3a..9de9d3a 100644
--- a/RobThree/TwoFactorAuth/TwoFactorAuthException.php
+++ b/lib/TwoFactorAuthException.php