diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 327eb61..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.tar.gz
-/noosfero-spb-*
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 3112967..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "software_communities"]
-	path = software_communities
-	url = git@softwarepublico.gov.br:softwarepublico/mpog_software.git
-[submodule "noosfero-spb-theme"]
-	path = noosfero-spb-theme
-	url = git@softwarepublico.gov.br:softwarepublico/noosfero-spb-theme.git
-[submodule "spb_migrations"]
-	path = spb_migrations
-	url = git@softwarepublico.gov.br:softwarepublico/spb_migrations.git
-[submodule "gov_user"]
-	path = gov_user
-	url = git@softwarepublico.gov.br:softwarepublico/gov_user.git
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2be3cc3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PACKAGE = noosfero-spb
-VERSION = 4.2
-DISTDIR = $(PACKAGE)-$(VERSION)
-TARBALL = $(DISTDIR).tar.gz
-
-all:
-	@echo Nothing to be $@, all good.
-
-plugins_dir=/usr/lib/noosfero/plugins
-themes_dir=/usr/lib/noosfero/public/designs/themes
-noosfero_dir=/usr/lib/noosfero
-
-dist: clean
-	mkdir $(DISTDIR)
-	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR) && tar xaf -)
-	tar --exclude=.git -czf $(TARBALL) $(DISTDIR)
-
-clean:
-	$(RM) $(TARBALL)
-	$(RM) -r $(DISTDIR)
-
-install:
-	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/software_communities
-	cp -vr software_communities/* $(DESTDIR)/$(plugins_dir)/software_communities/
-	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/spb_migrations
-	cp -vr spb_migrations/* $(DESTDIR)/$(plugins_dir)/spb_migrations/
-	install -d -m 0755 $(DESTDIR)/$(themes_dir)/noosfero-spb-theme
-	cp -vr noosfero-spb-theme/* $(DESTDIR)/$(themes_dir)/noosfero-spb-theme/
-	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/gov_user
-	cp -vr gov_user/* $(DESTDIR)/$(plugins_dir)/gov_user/
-	cd $(DESTDIR)/$(plugins_dir)/software_communities/ && \
-	mkdir -p locale/pt/LC_MESSAGES && \
-	msgfmt -o locale/pt/LC_MESSAGES/software_communities.mo po/pt/software_communities.po
-	cd ..
-	cd $(DESTDIR)/$(plugins_dir)/gov_user/ && \
-	mkdir -p locale/pt/LC_MESSAGES && \
-	msgfmt -o locale/pt/LC_MESSAGES/gov_user.mo po/pt/gov_user.po
diff --git a/gov_user b/gov_user
deleted file mode 160000
index 20d8849..0000000
--- a/gov_user
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 20d8849666eb1f43a6c75e5710bb6acdbdeac271
diff --git a/noosfero-spb-theme b/noosfero-spb-theme
deleted file mode 160000
index c861961..0000000
--- a/noosfero-spb-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c861961d9e1160dbff135a95d53c16a18d0184b9
diff --git a/software_communities b/software_communities
deleted file mode 160000
index b5a1769..0000000
--- a/software_communities
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5a1769b875637268d2f9750697ca15ecdf8101f
diff --git a/spb_migrations b/spb_migrations
deleted file mode 160000
index 9cd1d18..0000000
--- a/spb_migrations
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9cd1d18c6374e24f769adaa7abb912ecf794cc5a
diff --git a/src/noosfero-spb/.gitignore b/src/noosfero-spb/.gitignore
new file mode 100644
index 0000000..327eb61
--- /dev/null
+++ b/src/noosfero-spb/.gitignore
@@ -0,0 +1,2 @@
+*.tar.gz
+/noosfero-spb-*
diff --git a/src/noosfero-spb/.gitmodules b/src/noosfero-spb/.gitmodules
new file mode 100644
index 0000000..3112967
--- /dev/null
+++ b/src/noosfero-spb/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "software_communities"]
+	path = software_communities
+	url = git@softwarepublico.gov.br:softwarepublico/mpog_software.git
+[submodule "noosfero-spb-theme"]
+	path = noosfero-spb-theme
+	url = git@softwarepublico.gov.br:softwarepublico/noosfero-spb-theme.git
+[submodule "spb_migrations"]
+	path = spb_migrations
+	url = git@softwarepublico.gov.br:softwarepublico/spb_migrations.git
+[submodule "gov_user"]
+	path = gov_user
+	url = git@softwarepublico.gov.br:softwarepublico/gov_user.git
diff --git a/src/noosfero-spb/Makefile b/src/noosfero-spb/Makefile
new file mode 100644
index 0000000..2be3cc3
--- /dev/null
+++ b/src/noosfero-spb/Makefile
@@ -0,0 +1,37 @@
+PACKAGE = noosfero-spb
+VERSION = 4.2
+DISTDIR = $(PACKAGE)-$(VERSION)
+TARBALL = $(DISTDIR).tar.gz
+
+all:
+	@echo Nothing to be $@, all good.
+
+plugins_dir=/usr/lib/noosfero/plugins
+themes_dir=/usr/lib/noosfero/public/designs/themes
+noosfero_dir=/usr/lib/noosfero
+
+dist: clean
+	mkdir $(DISTDIR)
+	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR) && tar xaf -)
+	tar --exclude=.git -czf $(TARBALL) $(DISTDIR)
+
+clean:
+	$(RM) $(TARBALL)
+	$(RM) -r $(DISTDIR)
+
+install:
+	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/software_communities
+	cp -vr software_communities/* $(DESTDIR)/$(plugins_dir)/software_communities/
+	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/spb_migrations
+	cp -vr spb_migrations/* $(DESTDIR)/$(plugins_dir)/spb_migrations/
+	install -d -m 0755 $(DESTDIR)/$(themes_dir)/noosfero-spb-theme
+	cp -vr noosfero-spb-theme/* $(DESTDIR)/$(themes_dir)/noosfero-spb-theme/
+	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/gov_user
+	cp -vr gov_user/* $(DESTDIR)/$(plugins_dir)/gov_user/
+	cd $(DESTDIR)/$(plugins_dir)/software_communities/ && \
+	mkdir -p locale/pt/LC_MESSAGES && \
+	msgfmt -o locale/pt/LC_MESSAGES/software_communities.mo po/pt/software_communities.po
+	cd ..
+	cd $(DESTDIR)/$(plugins_dir)/gov_user/ && \
+	mkdir -p locale/pt/LC_MESSAGES && \
+	msgfmt -o locale/pt/LC_MESSAGES/gov_user.mo po/pt/gov_user.po
diff --git a/src/noosfero-spb/gov_user b/src/noosfero-spb/gov_user
new file mode 160000
index 0000000..20d8849
--- /dev/null
+++ b/src/noosfero-spb/gov_user
@@ -0,0 +1 @@
+Subproject commit 20d8849666eb1f43a6c75e5710bb6acdbdeac271
diff --git a/src/noosfero-spb/noosfero-spb-theme b/src/noosfero-spb/noosfero-spb-theme
new file mode 160000
index 0000000..c861961
--- /dev/null
+++ b/src/noosfero-spb/noosfero-spb-theme
@@ -0,0 +1 @@
+Subproject commit c861961d9e1160dbff135a95d53c16a18d0184b9
diff --git a/src/noosfero-spb/software_communities b/src/noosfero-spb/software_communities
new file mode 160000
index 0000000..b5a1769
--- /dev/null
+++ b/src/noosfero-spb/software_communities
@@ -0,0 +1 @@
+Subproject commit b5a1769b875637268d2f9750697ca15ecdf8101f
diff --git a/src/noosfero-spb/spb_migrations b/src/noosfero-spb/spb_migrations
new file mode 160000
index 0000000..9cd1d18
--- /dev/null
+++ b/src/noosfero-spb/spb_migrations
@@ -0,0 +1 @@
+Subproject commit 9cd1d18c6374e24f769adaa7abb912ecf794cc5a
--
libgit2 0.21.2