diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..22cc0b3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+PERL6=<PERL6>
+RAKUDO_DIR=<RAKUDO_DIR>
+PERL6LIB='<PERL6LIB>:$(RAKUDO_DIR)'
+
+SOURCES=lib/Bio/Root/Root.pm \
+        lib/Bio/RangeI.pm \
+        lib/Bio/Range.pm
+
+PIRS=$(SOURCES:.pm=.pir)
+
+all: $(PIRS)
+
+%.pir: %.pm
+	env PERL6LIB=$(PERL6LIB) $(PERL6) --target=pir --output=$@ $<
+
+clean:
+	rm -f $(PIRS)
+
+test: all
+	env PERL6LIB=$(PERL6LIB) prove -e '$(PERL6)' -r --nocolor t/
diff --git a/Bio/Grammar/Fasta.pm b/lib/Bio/Grammar/Fasta.pm
similarity index 100%
rename from Bio/Grammar/Fasta.pm
rename to lib/Bio/Grammar/Fasta.pm
diff --git a/Bio/PrimarySeq.pm b/lib/Bio/PrimarySeq.pm
similarity index 100%
rename from Bio/PrimarySeq.pm
rename to lib/Bio/PrimarySeq.pm
diff --git a/Bio/Role/Aliased.pm b/lib/Bio/Role/Aliased.pm
similarity index 100%
rename from Bio/Role/Aliased.pm
rename to lib/Bio/Role/Aliased.pm
diff --git a/Bio/Role/Annotate.pm b/lib/Bio/Role/Annotate.pm
similarity index 100%
rename from Bio/Role/Annotate.pm
rename to lib/Bio/Role/Annotate.pm
diff --git a/Bio/Role/AnnotationCollection.pm b/lib/Bio/Role/AnnotationCollection.pm
similarity index 100%
rename from Bio/Role/AnnotationCollection.pm
rename to lib/Bio/Role/AnnotationCollection.pm
diff --git a/Bio/Role/Describe.pm b/lib/Bio/Role/Describe.pm
similarity index 100%
rename from Bio/Role/Describe.pm
rename to lib/Bio/Role/Describe.pm
diff --git a/Bio/Role/Identify.pm b/lib/Bio/Role/Identify.pm
similarity index 100%
rename from Bio/Role/Identify.pm
rename to lib/Bio/Role/Identify.pm
diff --git a/Bio/Role/Range.pm b/lib/Bio/Role/Range.pm
similarity index 100%
rename from Bio/Role/Range.pm
rename to lib/Bio/Role/Range.pm
diff --git a/Bio/Root/Root.pm b/lib/Bio/Root/Root.pm
similarity index 100%
rename from Bio/Root/Root.pm
rename to lib/Bio/Root/Root.pm
diff --git a/Bio/Types.pm b/lib/Bio/Types.pm
similarity index 100%
rename from Bio/Types.pm
rename to lib/Bio/Types.pm