diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..13701646fea17dcee69bcb502e333ea9254453ae
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "awitpt"]
+	path = awitpt
+	url = git://git.devlabs.linuxassist.net/awit-perl-toolkit
+[submodule "webgui/awitef"]
+	path = webgui/awitef
+	url = git://git.devlabs.linuxassist.net/awit-extjs-framework
diff --git a/awitpt b/awitpt
new file mode 160000
index 0000000000000000000000000000000000000000..7e9eeee03f27752b4ae1f6609c762b4e00b2a899
--- /dev/null
+++ b/awitpt
@@ -0,0 +1 @@
+Subproject commit 7e9eeee03f27752b4ae1f6609c762b4e00b2a899
diff --git a/smadmin b/smadmin
index 379ccf8470e5ac5fb04f6d1125904747cc5ae952..c5b4152095956aa4f4b7f14101b9502b37d783e2 100755
--- a/smadmin
+++ b/smadmin
@@ -23,9 +23,8 @@ use warnings;
 
 # Set library directory
 use lib qw(
-	../ ./
 	smradius
-	awitpt/db
+	awitpt
 );
 
 
diff --git a/smradiusd b/smradiusd
index be982bea3bc8f968fa3fdf99695a6037772d5621..8a33e559d8743d9db81fce0ebc2ba6746bf4894b 100755
--- a/smradiusd
+++ b/smradiusd
@@ -22,9 +22,8 @@ use warnings;
 
 # Set library directory
 use lib qw(
-	../ ./
 	smradius
-	awitpt/db
+	awitpt
 );
 
 package radiusd;
diff --git a/update-git-modules b/update-git-modules
new file mode 100755
index 0000000000000000000000000000000000000000..23ed63179c44caa512e1bd74469998a0af5edfe3
--- /dev/null
+++ b/update-git-modules
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+git submodule update --recursive --init
+
+pushd awitpt
+git checkout v0.0.x
+popd
+
+pushd webgui/awitef
+git checkout v0.0.x
+popd
diff --git a/webgui/awitef b/webgui/awitef
new file mode 160000
index 0000000000000000000000000000000000000000..903ee7742824b7b104fe4b8984d465b3c91a8c50
--- /dev/null
+++ b/webgui/awitef
@@ -0,0 +1 @@
+Subproject commit 903ee7742824b7b104fe4b8984d465b3c91a8c50