diff --git a/composer.json b/composer.json
index 2a7d4db..81ec42f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,7 @@
         "omnipay/stripe": "~2.0",
         "psr/log": "~1.0"
     },
-    "autoload": {
-        "psr-0": { "Ruudk\\Payment\\StripeBundle": "" }
-    },
-    "target-dir": "Ruudk/Payment/StripeBundle"
+	"autoload": {
+        "psr-4": { "Ruudk\\Payment\\StripeBundle\\": "src" }
+    }
 }
diff --git a/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
similarity index 100%
rename from DependencyInjection/Configuration.php
rename to src/DependencyInjection/Configuration.php
diff --git a/DependencyInjection/RuudkPaymentStripeExtension.php b/src/DependencyInjection/RuudkPaymentStripeExtension.php
similarity index 100%
rename from DependencyInjection/RuudkPaymentStripeExtension.php
rename to src/DependencyInjection/RuudkPaymentStripeExtension.php
diff --git a/Form/CheckoutType.php b/src/Form/CheckoutType.php
similarity index 100%
rename from Form/CheckoutType.php
rename to src/Form/CheckoutType.php
diff --git a/Form/StripeType.php b/src/Form/StripeType.php
similarity index 100%
rename from Form/StripeType.php
rename to src/Form/StripeType.php
diff --git a/Plugin/CheckoutPlugin.php b/src/Plugin/CheckoutPlugin.php
similarity index 100%
rename from Plugin/CheckoutPlugin.php
rename to src/Plugin/CheckoutPlugin.php
diff --git a/Resources/config/services.xml b/src/Resources/config/services.xml
similarity index 100%
rename from Resources/config/services.xml
rename to src/Resources/config/services.xml
diff --git a/RuudkPaymentStripeBundle.php b/src/RuudkPaymentStripeBundle.php
similarity index 100%
rename from RuudkPaymentStripeBundle.php
rename to src/RuudkPaymentStripeBundle.php