diff --git a/README.md b/README.md
index f304d5c..484950b 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# ![Logo](https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/logo.png) TwoFactorAuth class for PHP
+# ![Logo](https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/img/logo.png) TwoFactorAuth class for PHP
 
 PHP class for [two-factor (or multi-factor) authentication](http://en.wikipedia.org/wiki/Multi-factor_authentication) using [TOTP](http://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm) and [QR-codes](http://en.wikipedia.org/wiki/QR_code). Inspired by, based on but most importantly an *improvement* on '[PHPGangsta/GoogleAuthenticator](https://github.com/PHPGangsta/GoogleAuthenticator)'.
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/multifactorauthforeveryone.png">
+<img src="https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/img/multifactorauthforeveryone.png">
 </p>
 
 ## Requirements
@@ -30,7 +30,7 @@ Here are some code snippets that should help you get started...
 
 ````php
 // Create a TwoFactorAuth instance
-$tfa = new RobThree\TwoFactorAuth\TwoFactorAuth('My Company');
+$tfa = new RobThree\Auth\TwoFactorAuth('My Company');
 ````
 
 The TwoFactorAuth class constructor accepts 6 parameters (all optional):
@@ -155,8 +155,8 @@ That's it. We're done! We've implemented our own provider (with help of PHP QR C
 
 ````php
 <?php
-$mp = new RobThree\TwoFactorAuth\TwoFactorAuth\Providers\Qr\MyProvider();
-$tfa = new RobThree\TwoFactorAuth\TwoFactorAuth\TwoFactorAuth('My Company', 6, 30, 'sha1', $mp);
+$mp = new RobThree\Auth\Providers\Qr\MyProvider();
+$tfa = new RobThree\Auth\TwoFactorAuth('My Company', 6, 30, 'sha1', $mp);
 $secret = $tfa->createSecret();
 ?>
 <p><img src="<?php $tfa->getQRCodeImageAsDataUri('Bob Ross', $secret) ?>"></p>
diff --git a/TwoFactorAuth.phpproj b/TwoFactorAuth.phpproj
index 6ad3e53..9323abc 100644
--- a/TwoFactorAuth.phpproj
+++ b/TwoFactorAuth.phpproj
@@ -22,8 +22,8 @@
     <IncludeDebugInformation>false</IncludeDebugInformation>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="demo.php" />
-    <Compile Include="loader.php" />
+    <Compile Include="demo\demo.php" />
+    <Compile Include="demo\loader.php" />
     <Compile Include="lib\Providers\Qr\BaseHTTPQRCodeProvider.php" />
     <Compile Include="lib\Providers\Qr\GoogleQRCodeProvider.php" />
     <Compile Include="lib\Providers\Qr\IQRCodeProvider.php" />
@@ -45,11 +45,13 @@
     <Folder Include="lib\Providers\" />
     <Folder Include="lib\Providers\Qr\" />
     <Folder Include="lib\Providers\Rng\" />
+    <Folder Include="demo\" />
+    <Folder Include="img\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="composer.json" />
     <Content Include="LICENSE" />
-    <Content Include="logo.png" />
-    <Content Include="multifactorauthforeveryone.png" />
+    <Content Include="img\logo.png" />
+    <Content Include="img\multifactorauthforeveryone.png" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/demo.php b/demo/demo.php
similarity index 96%
rename from demo.php
rename to demo/demo.php
index cf63352..4619fe3 100644
--- a/demo.php
+++ b/demo/demo.php
@@ -10,7 +10,7 @@
         require_once 'loader.php';
         Loader::register('RobThree','RobThree');
         
-        use \RobThree\TwoFactorAuth\TwoFactorAuth;
+        use \RobThree\Auth\TwoFactorAuth;
 
         $tfa = new TwoFactorAuth('MyApp');
 
diff --git a/loader.php b/demo/loader.php
similarity index 100%
rename from loader.php
rename to demo/loader.php
diff --git a/logo.png b/img/logo.png
similarity index 100%
rename from logo.png
rename to img/logo.png
diff --git a/multifactorauthforeveryone.png b/img/multifactorauthforeveryone.png
similarity index 100%
rename from multifactorauthforeveryone.png
rename to img/multifactorauthforeveryone.png