diff --git a/sourcepawn/compiler/compiler-init/amx.h b/sourcepawn/compiler/amx.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/amx.h
rename to sourcepawn/compiler/amx.h
diff --git a/sourcepawn/compiler/compiler-init/amxdbg.h b/sourcepawn/compiler/amxdbg.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/amxdbg.h
rename to sourcepawn/compiler/amxdbg.h
diff --git a/sourcepawn/compiler/compiler-init/libpawnc.c b/sourcepawn/compiler/libpawnc.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/libpawnc.c
rename to sourcepawn/compiler/libpawnc.c
diff --git a/sourcepawn/compiler/compiler-init/libpawnc.rc b/sourcepawn/compiler/libpawnc.rc
similarity index 100%
rename from sourcepawn/compiler/compiler-init/libpawnc.rc
rename to sourcepawn/compiler/libpawnc.rc
diff --git a/sourcepawn/compiler/compiler-init/lstring.c b/sourcepawn/compiler/lstring.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/lstring.c
rename to sourcepawn/compiler/lstring.c
diff --git a/sourcepawn/compiler/compiler-init/lstring.h b/sourcepawn/compiler/lstring.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/lstring.h
rename to sourcepawn/compiler/lstring.h
diff --git a/sourcepawn/compiler/compiler-init/memfile.c b/sourcepawn/compiler/memfile.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/memfile.c
rename to sourcepawn/compiler/memfile.c
diff --git a/sourcepawn/compiler/compiler-init/memfile.h b/sourcepawn/compiler/memfile.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/memfile.h
rename to sourcepawn/compiler/memfile.h
diff --git a/sourcepawn/compiler/compiler-init/osdefs.h b/sourcepawn/compiler/osdefs.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/osdefs.h
rename to sourcepawn/compiler/osdefs.h
diff --git a/sourcepawn/compiler/compiler-init/pawn.ico b/sourcepawn/compiler/pawn.ico
similarity index 100%
rename from sourcepawn/compiler/compiler-init/pawn.ico
rename to sourcepawn/compiler/pawn.ico
diff --git a/sourcepawn/compiler/compiler-init/pawncc.c b/sourcepawn/compiler/pawncc.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/pawncc.c
rename to sourcepawn/compiler/pawncc.c
diff --git a/sourcepawn/compiler/compiler-init/sc.h b/sourcepawn/compiler/sc.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc.h
rename to sourcepawn/compiler/sc.h
diff --git a/sourcepawn/compiler/compiler-init/sc1.c b/sourcepawn/compiler/sc1.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc1.c
rename to sourcepawn/compiler/sc1.c
diff --git a/sourcepawn/compiler/compiler-init/sc2.c b/sourcepawn/compiler/sc2.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc2.c
rename to sourcepawn/compiler/sc2.c
diff --git a/sourcepawn/compiler/compiler-init/sc3.c b/sourcepawn/compiler/sc3.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc3.c
rename to sourcepawn/compiler/sc3.c
diff --git a/sourcepawn/compiler/compiler-init/sc4.c b/sourcepawn/compiler/sc4.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc4.c
rename to sourcepawn/compiler/sc4.c
diff --git a/sourcepawn/compiler/compiler-init/sc5.c b/sourcepawn/compiler/sc5.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc5.c
rename to sourcepawn/compiler/sc5.c
diff --git a/sourcepawn/compiler/compiler-init/sc5.scp b/sourcepawn/compiler/sc5.scp
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc5.scp
rename to sourcepawn/compiler/sc5.scp
diff --git a/sourcepawn/compiler/compiler-init/sc6.c b/sourcepawn/compiler/sc6.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc6.c
rename to sourcepawn/compiler/sc6.c
diff --git a/sourcepawn/compiler/compiler-init/sc7.c b/sourcepawn/compiler/sc7.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc7.c
rename to sourcepawn/compiler/sc7.c
diff --git a/sourcepawn/compiler/compiler-init/sc7.scp b/sourcepawn/compiler/sc7.scp
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sc7.scp
rename to sourcepawn/compiler/sc7.scp
diff --git a/sourcepawn/compiler/compiler-init/scexpand.c b/sourcepawn/compiler/scexpand.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/scexpand.c
rename to sourcepawn/compiler/scexpand.c
diff --git a/sourcepawn/compiler/compiler-init/sci18n.c b/sourcepawn/compiler/sci18n.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sci18n.c
rename to sourcepawn/compiler/sci18n.c
diff --git a/sourcepawn/compiler/compiler-init/sclist.c b/sourcepawn/compiler/sclist.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sclist.c
rename to sourcepawn/compiler/sclist.c
diff --git a/sourcepawn/compiler/compiler-init/scmemfil.c b/sourcepawn/compiler/scmemfil.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/scmemfil.c
rename to sourcepawn/compiler/scmemfil.c
diff --git a/sourcepawn/compiler/compiler-init/scstate.c b/sourcepawn/compiler/scstate.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/scstate.c
rename to sourcepawn/compiler/scstate.c
diff --git a/sourcepawn/compiler/compiler-init/scvars.c b/sourcepawn/compiler/scvars.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/scvars.c
rename to sourcepawn/compiler/scvars.c
diff --git a/sourcepawn/compiler/compiler-init/sp_file.h b/sourcepawn/compiler/sp_file.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/sp_file.h
rename to sourcepawn/compiler/sp_file.h
diff --git a/sourcepawn/compiler/compiler-init/spcomp.sln b/sourcepawn/compiler/spcomp.sln
similarity index 100%
rename from sourcepawn/compiler/compiler-init/spcomp.sln
rename to sourcepawn/compiler/spcomp.sln
diff --git a/sourcepawn/compiler/compiler-init/spcomp.vcproj b/sourcepawn/compiler/spcomp.vcproj
similarity index 100%
rename from sourcepawn/compiler/compiler-init/spcomp.vcproj
rename to sourcepawn/compiler/spcomp.vcproj
diff --git a/sourcepawn/compiler/compiler-init/svnrev.h b/sourcepawn/compiler/svnrev.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/svnrev.h
rename to sourcepawn/compiler/svnrev.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/adler32.c b/sourcepawn/compiler/zlib/adler32.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/adler32.c
rename to sourcepawn/compiler/zlib/adler32.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/compress.c b/sourcepawn/compiler/zlib/compress.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/compress.c
rename to sourcepawn/compiler/zlib/compress.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/crc32.c b/sourcepawn/compiler/zlib/crc32.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/crc32.c
rename to sourcepawn/compiler/zlib/crc32.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/crc32.h b/sourcepawn/compiler/zlib/crc32.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/crc32.h
rename to sourcepawn/compiler/zlib/crc32.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/deflate.c b/sourcepawn/compiler/zlib/deflate.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/deflate.c
rename to sourcepawn/compiler/zlib/deflate.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/deflate.h b/sourcepawn/compiler/zlib/deflate.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/deflate.h
rename to sourcepawn/compiler/zlib/deflate.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/gzio.c b/sourcepawn/compiler/zlib/gzio.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/gzio.c
rename to sourcepawn/compiler/zlib/gzio.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/infback.c b/sourcepawn/compiler/zlib/infback.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/infback.c
rename to sourcepawn/compiler/zlib/infback.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/inffast.c b/sourcepawn/compiler/zlib/inffast.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inffast.c
rename to sourcepawn/compiler/zlib/inffast.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/inffast.h b/sourcepawn/compiler/zlib/inffast.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inffast.h
rename to sourcepawn/compiler/zlib/inffast.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/inffixed.h b/sourcepawn/compiler/zlib/inffixed.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inffixed.h
rename to sourcepawn/compiler/zlib/inffixed.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/inflate.c b/sourcepawn/compiler/zlib/inflate.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inflate.c
rename to sourcepawn/compiler/zlib/inflate.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/inflate.h b/sourcepawn/compiler/zlib/inflate.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inflate.h
rename to sourcepawn/compiler/zlib/inflate.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/inftrees.c b/sourcepawn/compiler/zlib/inftrees.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inftrees.c
rename to sourcepawn/compiler/zlib/inftrees.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/inftrees.h b/sourcepawn/compiler/zlib/inftrees.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/inftrees.h
rename to sourcepawn/compiler/zlib/inftrees.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/trees.c b/sourcepawn/compiler/zlib/trees.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/trees.c
rename to sourcepawn/compiler/zlib/trees.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/trees.h b/sourcepawn/compiler/zlib/trees.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/trees.h
rename to sourcepawn/compiler/zlib/trees.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/uncompr.c b/sourcepawn/compiler/zlib/uncompr.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/uncompr.c
rename to sourcepawn/compiler/zlib/uncompr.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/zconf.h b/sourcepawn/compiler/zlib/zconf.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/zconf.h
rename to sourcepawn/compiler/zlib/zconf.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/zlib.h b/sourcepawn/compiler/zlib/zlib.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/zlib.h
rename to sourcepawn/compiler/zlib/zlib.h
diff --git a/sourcepawn/compiler/compiler-init/zlib/zutil.c b/sourcepawn/compiler/zlib/zutil.c
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/zutil.c
rename to sourcepawn/compiler/zlib/zutil.c
diff --git a/sourcepawn/compiler/compiler-init/zlib/zutil.h b/sourcepawn/compiler/zlib/zutil.h
similarity index 100%
rename from sourcepawn/compiler/compiler-init/zlib/zutil.h
rename to sourcepawn/compiler/zlib/zutil.h