diff --git a/extra/cairo/build b/xorg/cairo/build
similarity index 100%
rename from extra/cairo/build
rename to xorg/cairo/build
diff --git a/extra/cairo/checksums b/xorg/cairo/checksums
similarity index 100%
rename from extra/cairo/checksums
rename to xorg/cairo/checksums
diff --git a/extra/cairo/depends b/xorg/cairo/depends
similarity index 100%
rename from extra/cairo/depends
rename to xorg/cairo/depends
diff --git a/extra/cairo/sources b/xorg/cairo/sources
similarity index 100%
rename from extra/cairo/sources
rename to xorg/cairo/sources
diff --git a/extra/cairo/version b/xorg/cairo/version
similarity index 100%
rename from extra/cairo/version
rename to xorg/cairo/version
diff --git a/extra/freetype-harfbuzz/build b/xorg/freetype-harfbuzz/build
similarity index 100%
rename from extra/freetype-harfbuzz/build
rename to xorg/freetype-harfbuzz/build
diff --git a/extra/freetype-harfbuzz/checksums b/xorg/freetype-harfbuzz/checksums
similarity index 100%
rename from extra/freetype-harfbuzz/checksums
rename to xorg/freetype-harfbuzz/checksums
diff --git a/extra/freetype-harfbuzz/depends b/xorg/freetype-harfbuzz/depends
similarity index 100%
rename from extra/freetype-harfbuzz/depends
rename to xorg/freetype-harfbuzz/depends
diff --git a/extra/freetype-harfbuzz/sources b/xorg/freetype-harfbuzz/sources
similarity index 100%
rename from extra/freetype-harfbuzz/sources
rename to xorg/freetype-harfbuzz/sources
diff --git a/extra/freetype-harfbuzz/version b/xorg/freetype-harfbuzz/version
similarity index 100%
rename from extra/freetype-harfbuzz/version
rename to xorg/freetype-harfbuzz/version
diff --git a/extra/gtk+2/build b/xorg/gtk+2/build
similarity index 100%
rename from extra/gtk+2/build
rename to xorg/gtk+2/build
diff --git a/extra/gtk+2/checksums b/xorg/gtk+2/checksums
similarity index 100%
rename from extra/gtk+2/checksums
rename to xorg/gtk+2/checksums
diff --git a/extra/gtk+2/depends b/xorg/gtk+2/depends
similarity index 100%
rename from extra/gtk+2/depends
rename to xorg/gtk+2/depends
diff --git a/extra/gtk+2/sources b/xorg/gtk+2/sources
similarity index 100%
rename from extra/gtk+2/sources
rename to xorg/gtk+2/sources
diff --git a/extra/gtk+2/version b/xorg/gtk+2/version
similarity index 100%
rename from extra/gtk+2/version
rename to xorg/gtk+2/version
diff --git a/extra/gtk+3/build b/xorg/gtk+3/build
similarity index 100%
rename from extra/gtk+3/build
rename to xorg/gtk+3/build
diff --git a/extra/gtk+3/checksums b/xorg/gtk+3/checksums
similarity index 100%
rename from extra/gtk+3/checksums
rename to xorg/gtk+3/checksums
diff --git a/extra/gtk+3/depends b/xorg/gtk+3/depends
similarity index 100%
rename from extra/gtk+3/depends
rename to xorg/gtk+3/depends
diff --git a/extra/gtk+3/sources b/xorg/gtk+3/sources
similarity index 100%
rename from extra/gtk+3/sources
rename to xorg/gtk+3/sources
diff --git a/extra/gtk+3/version b/xorg/gtk+3/version
similarity index 100%
rename from extra/gtk+3/version
rename to xorg/gtk+3/version
diff --git a/extra/pango/build b/xorg/pango/build
similarity index 100%
rename from extra/pango/build
rename to xorg/pango/build
diff --git a/extra/pango/checksums b/xorg/pango/checksums
similarity index 100%
rename from extra/pango/checksums
rename to xorg/pango/checksums
diff --git a/extra/pango/depends b/xorg/pango/depends
similarity index 100%
rename from extra/pango/depends
rename to xorg/pango/depends
diff --git a/extra/pango/sources b/xorg/pango/sources
similarity index 100%
rename from extra/pango/sources
rename to xorg/pango/sources
diff --git a/extra/pango/version b/xorg/pango/version
similarity index 100%
rename from extra/pango/version
rename to xorg/pango/version