diff --git a/.gitignore b/.gitignore
index 2314abc..20366b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,4 @@ src/Git2/Repository.pir
 src/Git2/Index.pir
 src/Git2/Oid.pir
 src/Git2/Odb.pir
-rosella
 tags
diff --git a/.gitmodules b/.gitmodules
index 68d41b7..03521d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "rosella"]
-	path = rosella
+[submodule "ext/Rosella"]
+	path = ext/Rosella
 	url = git://github.com/Whiteknight/Rosella
-[submodule "Rosella"]
-	path = Rosella
-	url = https://github.com/Whiteknight/Rosella.git
diff --git a/Makefile b/Makefile
index 39d6f65..c2ccd8a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ pbclib: $(git2pbc) src/git2.pbc
 %.pbc: %.pir
 	parrot -o $@ $<
 
-rosella: Rosella/Makefile
-	$(MAKE) -C Rosella build
-	ln -s Rosella/rosella rosella
+rosella: ext/Rosella/Makefile
+	$(MAKE) -C ext/Rosella build
+	ln -s ext/Rosella/rosella rosella
 
 nci: src/git2.nci
 
@@ -27,7 +27,7 @@ src/git2.nci:
 	perl ./bin/header2nci.pl /usr/local/include/git2.h >> src/git2.nci ; \
 	for i in /usr/local/include/git2/*; do  perl ./bin/header2nci.pl $$i >> src/git2.nci ; done
 
-Rosella/Makefile:
+ext/Rosella/Makefile:
 	git submodule init
 	git submodule update
 
diff --git a/Rosella b/ext/Rosella
similarity index 100%
rename from Rosella
rename to ext/Rosella