diff --git a/build/PARROT_REVISION b/build/PARROT_REVISION
index d7b82ec..62dc12e 100644
--- a/build/PARROT_REVISION
+++ b/build/PARROT_REVISION
@@ -1 +1 @@
-36930
+37000
diff --git a/build/templates/src/pmc/Makefile.in b/build/templates/src/pmc/Makefile.in
index ddf8e4b..f072d11 100644
--- a/build/templates/src/pmc/Makefile.in
+++ b/build/templates/src/pmc/Makefile.in
@@ -10,7 +10,6 @@ CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@
 
 # Set up directories
 BUILD_DIR     = @build_dir@
-PMC_DIR       = src/pmc
 INCLUDE_DIR   = $(BUILD_DIR)/include
 PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
 
@@ -19,7 +18,7 @@ LOAD_EXT      = @load_ext@
 O             = @o@
 
 
-PIPP_GROUP    = $(PMC_DIR)/pipp_group$(LOAD_EXT)
+PIPP_GROUP    = pipp_group$(LOAD_EXT)
 
 PMCS = \
   php \
@@ -27,7 +26,7 @@ PMCS = \
   phpboolean \
   phpfloat \
   phpinteger \
-  pippresource \
+  phpresource \
   phpstring \
   phpnull
 
@@ -37,7 +36,7 @@ PMC_SOURCES = \
   phpboolean.pmc \
   phpfloat.pmc \
   phpinteger.pmc \
-  pippresource.pmc \
+  phpresource.pmc \
   phpstring.pmc \
   phpnull.pmc
 
@@ -65,14 +64,11 @@ pipp_hash$(O): pipp_hash.c pipp_hash.h
 	$(TOUCH) phparray.pmc
 	$(CC) $(CFLAGS) -I$(INCLUDE_DIR) pipp_hash.c -c -g -o pipp_hash$(O)
 
-export DYNPMC_INCLUDE=$(BUILD_DIR)/languages/pipp
-export DYNPMC_LINK=$(BUILD_DIR)/languages/pipp/src/pmc/pipp_hash$(O)
-
 $(PIPP_GROUP): $(PMC_SOURCES)
-	@$(PMCBUILD) generate $(PMCS)
-	@$(PMCBUILD) compile $(PMCS)
-	@$(PMCBUILD) linklibs $(PMCS)
-	@$(PMCBUILD) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
+	$(PMCBUILD) generate $(PMCS)
+	$(PMCBUILD) compile $(PMCS)
+	$(PMCBUILD) linklibs $(PMCS)
+	$(PMCBUILD) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
 
 # cleaning up
 clean:
diff --git a/src/common/builtins.pir b/src/common/builtins.pir
index 5e70edb..6494dae 100644
--- a/src/common/builtins.pir
+++ b/src/common/builtins.pir
@@ -3,10 +3,10 @@
 
 .loadlib 'pipp_group'
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
-.include 'languages/pipp/src/common/guts.pir'
-.include 'languages/pipp/src/classes/Object.pir'
-.include 'languages/pipp/src/common/eval.pir'
+.include 'src/common/php_MACRO.pir'
+.include 'src/common/guts.pir'
+.include 'src/classes/Object.pir'
+.include 'src/common/eval.pir'
 
 # steal builtins from Perl6
 .sub 'print'
@@ -325,7 +325,7 @@
     .return($P0)
 .end
 
-.include 'languages/pipp/src/common/php_standard.pir'
+.include 'src/common/php_standard.pir'
 
 # Local Variables:
 #   mode: pir
diff --git a/src/common/php_API.pir b/src/common/php_API.pir
index 8571370..544fc26 100644
--- a/src/common/php_API.pir
+++ b/src/common/php_API.pir
@@ -12,7 +12,7 @@ php_API.pir - PHP API Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .sub '__onload' :anon :load :init
 
diff --git a/src/common/php_base64.pir b/src/common/php_base64.pir
index db1b9be..b79e0cd 100644
--- a/src/common/php_base64.pir
+++ b/src/common/php_base64.pir
@@ -12,7 +12,7 @@ php_base64.pir - PHP base64 Standard Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .sub '__onload' :load
     load_bytecode 'MIME/Base64.pbc'
diff --git a/src/common/php_builtin.pir b/src/common/php_builtin.pir
index 51c0692..d072f47 100644
--- a/src/common/php_builtin.pir
+++ b/src/common/php_builtin.pir
@@ -12,7 +12,7 @@ php_builtin.pir - PHP builtin Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 =item C<bool class_exists(string classname [, bool autoload])>
 
diff --git a/src/common/php_ctype.pir b/src/common/php_ctype.pir
index cf7722a..202c219 100644
--- a/src/common/php_ctype.pir
+++ b/src/common/php_ctype.pir
@@ -14,7 +14,7 @@ php_ctype.pir - PHP ctype Library
 
 .HLL 'pipp'
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 .include 'cclass.pasm'
 
 .macro CTYPE(class, args)
diff --git a/src/common/php_gmp.pir b/src/common/php_gmp.pir
index 5a1070f..339f3e9 100644
--- a/src/common/php_gmp.pir
+++ b/src/common/php_gmp.pir
@@ -18,7 +18,7 @@ The good way is by a full NCI wrapper over the GMP library.
 
 .HLL 'pipp'
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .const string GMP_PMC          = 'BigInt'
 
diff --git a/src/common/php_info.pir b/src/common/php_info.pir
index bb1327d..64331ea 100644
--- a/src/common/php_info.pir
+++ b/src/common/php_info.pir
@@ -12,7 +12,7 @@ php_info.pir - PHP info Standard Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .const string PHP_LOGO_GUID     = 'PHPE9568F34-D428-11d2-A769-00AA001ACF42'
 .const string PHP_EGG_LOGO_GUID = 'PHPE9568F36-D428-11d2-A769-00AA001ACF42'
diff --git a/src/common/php_md5.pir b/src/common/php_md5.pir
index 36535a7..fcba829 100644
--- a/src/common/php_md5.pir
+++ b/src/common/php_md5.pir
@@ -12,7 +12,7 @@ php_md5.pir - PHP md5 Standard Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .sub '__onload' :anon :load
     $P0 = loadlib 'digest_group'
diff --git a/src/common/php_pcre.pir b/src/common/php_pcre.pir
index 30196f5..2a4dbb2 100644
--- a/src/common/php_pcre.pir
+++ b/src/common/php_pcre.pir
@@ -14,7 +14,7 @@ php_pcre.pir - PHP pcre  Library
 
 .HLL 'pipp'
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 .include 'cclass.pasm'
 
 .sub '__onload' :anon :load :init
diff --git a/src/common/php_rand.pir b/src/common/php_rand.pir
index ca5a508..92474d5 100644
--- a/src/common/php_rand.pir
+++ b/src/common/php_rand.pir
@@ -12,7 +12,7 @@ php_rand.pir - PHP rand Standard Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .sub '__onload' :anon :load
     load_bytecode 'Math/Random/mt19937ar.pbc'
diff --git a/src/common/php_sha1.pir b/src/common/php_sha1.pir
index d5463e5..7441586 100644
--- a/src/common/php_sha1.pir
+++ b/src/common/php_sha1.pir
@@ -12,7 +12,7 @@ php_sha1.pir - PHP sha1 Standard Library
 
 =cut
 
-.include 'languages/pipp/src/common/php_MACRO.pir'
+.include 'src/common/php_MACRO.pir'
 
 .sub '__onload' :anon :load
     $P0 = loadlib 'digest_group'
diff --git a/src/common/php_standard.pir b/src/common/php_standard.pir
index 856a39d..691af16 100644
--- a/src/common/php_standard.pir
+++ b/src/common/php_standard.pir
@@ -1,60 +1,60 @@
 # Copyright (C) 2008, The Perl Foundation.
 
-.include 'languages/pipp/src/common/php_API.pir'
+.include 'src/common/php_API.pir'
 
-.include 'languages/pipp/src/common/php_array.pir'
-.include 'languages/pipp/src/common/php_assert.pir'
-.include 'languages/pipp/src/common/php_base64.pir'
-.include 'languages/pipp/src/common/php_basic.pir'
-.include 'languages/pipp/src/common/php_browscap.pir'
-.include 'languages/pipp/src/common/php_builtin.pir'
-.include 'languages/pipp/src/common/php_crc32.pir'
-.include 'languages/pipp/src/common/php_crypt.pir'
-.include 'languages/pipp/src/common/php_cyr_convert.pir'
-.include 'languages/pipp/src/common/php_datetime.pir'
-.include 'languages/pipp/src/common/php_dir.pir'
-.include 'languages/pipp/src/common/php_dl.pir'
-.include 'languages/pipp/src/common/php_dns.pir'
-.include 'languages/pipp/src/common/php_exec.pir'
-.include 'languages/pipp/src/common/php_file.pir'
-.include 'languages/pipp/src/common/php_filestat.pir'
-.include 'languages/pipp/src/common/php_filesystem.pir'
-.include 'languages/pipp/src/common/php_formatted_print.pir'
-.include 'languages/pipp/src/common/php_fsock.pir'
-.include 'languages/pipp/src/common/php_ftok.pir'
-.include 'languages/pipp/src/common/php_head.pir'
-.include 'languages/pipp/src/common/php_html.pir'
-.include 'languages/pipp/src/common/php_http.pir'
-.include 'languages/pipp/src/common/php_image.pir'
-.include 'languages/pipp/src/common/php_info.pir'
-.include 'languages/pipp/src/common/php_iptc.pir'
-.include 'languages/pipp/src/common/php_lcg.pir'
-.include 'languages/pipp/src/common/php_levenshtein.pir'
-.include 'languages/pipp/src/common/php_link.pir'
-.include 'languages/pipp/src/common/php_mail.pir'
-.include 'languages/pipp/src/common/php_math.pir'
-.include 'languages/pipp/src/common/php_md5.pir'
-.include 'languages/pipp/src/common/php_metaphone.pir'
-.include 'languages/pipp/src/common/php_microtime.pir'
-.include 'languages/pipp/src/common/php_pack.pir'
-.include 'languages/pipp/src/common/php_pageinfo.pir'
-.include 'languages/pipp/src/common/php_proc_open.pir'
-.include 'languages/pipp/src/common/php_quot_print.pir'
-.include 'languages/pipp/src/common/php_rand.pir'
-.include 'languages/pipp/src/common/php_reflection.pir'
-.include 'languages/pipp/src/common/php_reg.pir'
-.include 'languages/pipp/src/common/php_sha1.pir'
-.include 'languages/pipp/src/common/php_soundex.pir'
-.include 'languages/pipp/src/common/php_streamsfuncs.pir'
-.include 'languages/pipp/src/common/php_string.pir'
-.include 'languages/pipp/src/common/php_syslog.pir'
-.include 'languages/pipp/src/common/php_type.pir'
-.include 'languages/pipp/src/common/php_uniqid.pir'
-.include 'languages/pipp/src/common/php_url.pir'
-.include 'languages/pipp/src/common/php_user_filters.pir'
-.include 'languages/pipp/src/common/php_uuencode.pir'
-.include 'languages/pipp/src/common/php_var.pir'
-.include 'languages/pipp/src/common/php_versioning.pir'
+.include 'src/common/php_array.pir'
+.include 'src/common/php_assert.pir'
+.include 'src/common/php_base64.pir'
+.include 'src/common/php_basic.pir'
+.include 'src/common/php_browscap.pir'
+.include 'src/common/php_builtin.pir'
+.include 'src/common/php_crc32.pir'
+.include 'src/common/php_crypt.pir'
+.include 'src/common/php_cyr_convert.pir'
+.include 'src/common/php_datetime.pir'
+.include 'src/common/php_dir.pir'
+.include 'src/common/php_dl.pir'
+.include 'src/common/php_dns.pir'
+.include 'src/common/php_exec.pir'
+.include 'src/common/php_file.pir'
+.include 'src/common/php_filestat.pir'
+.include 'src/common/php_filesystem.pir'
+.include 'src/common/php_formatted_print.pir'
+.include 'src/common/php_fsock.pir'
+.include 'src/common/php_ftok.pir'
+.include 'src/common/php_head.pir'
+.include 'src/common/php_html.pir'
+.include 'src/common/php_http.pir'
+.include 'src/common/php_image.pir'
+.include 'src/common/php_info.pir'
+.include 'src/common/php_iptc.pir'
+.include 'src/common/php_lcg.pir'
+.include 'src/common/php_levenshtein.pir'
+.include 'src/common/php_link.pir'
+.include 'src/common/php_mail.pir'
+.include 'src/common/php_math.pir'
+.include 'src/common/php_md5.pir'
+.include 'src/common/php_metaphone.pir'
+.include 'src/common/php_microtime.pir'
+.include 'src/common/php_pack.pir'
+.include 'src/common/php_pageinfo.pir'
+.include 'src/common/php_proc_open.pir'
+.include 'src/common/php_quot_print.pir'
+.include 'src/common/php_rand.pir'
+.include 'src/common/php_reflection.pir'
+.include 'src/common/php_reg.pir'
+.include 'src/common/php_sha1.pir'
+.include 'src/common/php_soundex.pir'
+.include 'src/common/php_streamsfuncs.pir'
+.include 'src/common/php_string.pir'
+.include 'src/common/php_syslog.pir'
+.include 'src/common/php_type.pir'
+.include 'src/common/php_uniqid.pir'
+.include 'src/common/php_url.pir'
+.include 'src/common/php_user_filters.pir'
+.include 'src/common/php_uuencode.pir'
+.include 'src/common/php_var.pir'
+.include 'src/common/php_versioning.pir'
 
 # Local Variables:
 #   mode: pir
diff --git a/src/pmc/phparray.pmc b/src/pmc/phparray.pmc
index 7239c78..c9bcf3c 100644
--- a/src/pmc/phparray.pmc
+++ b/src/pmc/phparray.pmc
@@ -18,7 +18,7 @@ Implementation of the Array datatype.
 */
 
 #include "pipp_private.h"
-#include "src/pmc/pipp_hash.h"
+#include "pipp_hash.h"
 
 pmclass PhpArray
     dynpmc
diff --git a/src/pmc/pippresource.pmc b/src/pmc/phpresource.pmc
similarity index 93%
rename from src/pmc/pippresource.pmc
rename to src/pmc/phpresource.pmc
index d96da1e..dab1350 100644
--- a/src/pmc/pippresource.pmc
+++ b/src/pmc/phpresource.pmc
@@ -3,7 +3,7 @@ Copyright (C) 2008, The Perl Foundation.
 
 =head1 NAME
 
-src/pmc/pippresource.pmc - Pipp Resource
+src/pmc/phpresource.pmc - PHP Resource
 
 =head1 DESCRIPTION
 
@@ -17,7 +17,7 @@ src/pmc/pippresource.pmc - Pipp Resource
 
 #include "pipp_private.h"
 
-pmclass PippResource
+pmclass PhpResource
     provides ref
     dynpmc
     group    pipp_group
@@ -34,7 +34,7 @@ Raises an exception. Use C<init_pmc()>.
 */
     void init() {
         Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_INVALID_OPERATION,
-                       "PippResource init without pmc");
+                       "PhpResource init without pmc");
     }
 
 /*