diff --git a/classes/model/acl/user.php b/classes/Model/ACL/User.php
similarity index 100%
rename from classes/model/acl/user.php
rename to classes/Model/ACL/User.php
diff --git a/classes/policy.php b/classes/Policy.php
similarity index 100%
rename from classes/policy.php
rename to classes/Policy.php
diff --git a/classes/policy/exception.php b/classes/Policy/Exception.php
similarity index 100%
rename from classes/policy/exception.php
rename to classes/Policy/Exception.php
diff --git a/classes/policy/login.php b/classes/Policy/Login.php
similarity index 100%
rename from classes/policy/login.php
rename to classes/Policy/Login.php
diff --git a/classes/policy/logout.php b/classes/Policy/Logout.php
similarity index 100%
rename from classes/policy/logout.php
rename to classes/Policy/Logout.php
diff --git a/classes/vendo/policy.php b/classes/Vendo/Policy.php
similarity index 100%
rename from classes/vendo/policy.php
rename to classes/Vendo/Policy.php
diff --git a/classes/vendo/policy/exception.php b/classes/Vendo/Policy/Exception.php
similarity index 100%
rename from classes/vendo/policy/exception.php
rename to classes/Vendo/Policy/Exception.php
diff --git a/classes/vendo/policy/login.php b/classes/Vendo/Policy/Login.php
similarity index 100%
rename from classes/vendo/policy/login.php
rename to classes/Vendo/Policy/Login.php
diff --git a/classes/vendo/policy/logout.php b/classes/Vendo/Policy/Logout.php
similarity index 100%
rename from classes/vendo/policy/logout.php
rename to classes/Vendo/Policy/Logout.php
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..85c4c99
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,15 @@
+{
+	"name": "modulargaming/acl",
+	"type": "kohana-module",
+	"license": "BSD-3-Clause",
+	"description": "ACL module for Modular Gaming",
+	"keywords": [
+		"modulargaming"
+	],
+	"homepage": "https://github.com/modulargaming/acl",
+
+	"require": {
+		"php": ">=5.3.2",
+		"composer/installers": "*"
+	}
+}
diff --git a/tests/acl_test.php b/tests/ACL_Test.php
similarity index 100%
rename from tests/acl_test.php
rename to tests/ACL_Test.php