diff --git a/basis/gstreamer/Gst-0.10.gir b/extra/gstreamer/Gst-0.10.gir
similarity index 100%
rename from basis/gstreamer/Gst-0.10.gir
rename to extra/gstreamer/Gst-0.10.gir
diff --git a/basis/gstreamer/app/GstApp-0.10.gir b/extra/gstreamer/app/GstApp-0.10.gir
similarity index 100%
rename from basis/gstreamer/app/GstApp-0.10.gir
rename to extra/gstreamer/app/GstApp-0.10.gir
diff --git a/basis/gstreamer/app/app.factor b/extra/gstreamer/app/app.factor
similarity index 100%
rename from basis/gstreamer/app/app.factor
rename to extra/gstreamer/app/app.factor
diff --git a/basis/gstreamer/app/ffi/ffi.factor b/extra/gstreamer/app/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/app/ffi/ffi.factor
rename to extra/gstreamer/app/ffi/ffi.factor
diff --git a/basis/gstreamer/audio/GstAudio-0.10.gir b/extra/gstreamer/audio/GstAudio-0.10.gir
similarity index 100%
rename from basis/gstreamer/audio/GstAudio-0.10.gir
rename to extra/gstreamer/audio/GstAudio-0.10.gir
diff --git a/basis/gstreamer/audio/audio.factor b/extra/gstreamer/audio/audio.factor
similarity index 100%
rename from basis/gstreamer/audio/audio.factor
rename to extra/gstreamer/audio/audio.factor
diff --git a/basis/gstreamer/audio/ffi/ffi.factor b/extra/gstreamer/audio/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/audio/ffi/ffi.factor
rename to extra/gstreamer/audio/ffi/ffi.factor
diff --git a/basis/gstreamer/authors.txt b/extra/gstreamer/authors.txt
similarity index 100%
rename from basis/gstreamer/authors.txt
rename to extra/gstreamer/authors.txt
diff --git a/basis/gstreamer/base/GstBase-0.10.gir b/extra/gstreamer/base/GstBase-0.10.gir
similarity index 100%
rename from basis/gstreamer/base/GstBase-0.10.gir
rename to extra/gstreamer/base/GstBase-0.10.gir
diff --git a/basis/gstreamer/base/base.factor b/extra/gstreamer/base/base.factor
similarity index 100%
rename from basis/gstreamer/base/base.factor
rename to extra/gstreamer/base/base.factor
diff --git a/basis/gstreamer/base/ffi/ffi.factor b/extra/gstreamer/base/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/base/ffi/ffi.factor
rename to extra/gstreamer/base/ffi/ffi.factor
diff --git a/basis/gstreamer/check/GstCheck-0.10.gir b/extra/gstreamer/check/GstCheck-0.10.gir
similarity index 100%
rename from basis/gstreamer/check/GstCheck-0.10.gir
rename to extra/gstreamer/check/GstCheck-0.10.gir
diff --git a/basis/gstreamer/check/check.factor b/extra/gstreamer/check/check.factor
similarity index 100%
rename from basis/gstreamer/check/check.factor
rename to extra/gstreamer/check/check.factor
diff --git a/basis/gstreamer/check/ffi/ffi.factor b/extra/gstreamer/check/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/check/ffi/ffi.factor
rename to extra/gstreamer/check/ffi/ffi.factor
diff --git a/basis/gstreamer/controller/GstController-0.10.gir b/extra/gstreamer/controller/GstController-0.10.gir
similarity index 100%
rename from basis/gstreamer/controller/GstController-0.10.gir
rename to extra/gstreamer/controller/GstController-0.10.gir
diff --git a/basis/gstreamer/controller/controller.factor b/extra/gstreamer/controller/controller.factor
similarity index 100%
rename from basis/gstreamer/controller/controller.factor
rename to extra/gstreamer/controller/controller.factor
diff --git a/basis/gstreamer/controller/ffi/ffi.factor b/extra/gstreamer/controller/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/controller/ffi/ffi.factor
rename to extra/gstreamer/controller/ffi/ffi.factor
diff --git a/basis/gstreamer/ffi/ffi.factor b/extra/gstreamer/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/ffi/ffi.factor
rename to extra/gstreamer/ffi/ffi.factor
diff --git a/basis/gstreamer/fft/GstFft-0.10.gir b/extra/gstreamer/fft/GstFft-0.10.gir
similarity index 100%
rename from basis/gstreamer/fft/GstFft-0.10.gir
rename to extra/gstreamer/fft/GstFft-0.10.gir
diff --git a/basis/gstreamer/fft/ffi/ffi.factor b/extra/gstreamer/fft/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/fft/ffi/ffi.factor
rename to extra/gstreamer/fft/ffi/ffi.factor
diff --git a/basis/gstreamer/fft/fft.factor b/extra/gstreamer/fft/fft.factor
similarity index 100%
rename from basis/gstreamer/fft/fft.factor
rename to extra/gstreamer/fft/fft.factor
diff --git a/basis/gstreamer/gstreamer.factor b/extra/gstreamer/gstreamer.factor
similarity index 100%
rename from basis/gstreamer/gstreamer.factor
rename to extra/gstreamer/gstreamer.factor
diff --git a/basis/gstreamer/interfaces/GstInterfaces-0.10.gir b/extra/gstreamer/interfaces/GstInterfaces-0.10.gir
similarity index 100%
rename from basis/gstreamer/interfaces/GstInterfaces-0.10.gir
rename to extra/gstreamer/interfaces/GstInterfaces-0.10.gir
diff --git a/basis/gstreamer/interfaces/ffi/ffi.factor b/extra/gstreamer/interfaces/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/interfaces/ffi/ffi.factor
rename to extra/gstreamer/interfaces/ffi/ffi.factor
diff --git a/basis/gstreamer/interfaces/interfaces.factor b/extra/gstreamer/interfaces/interfaces.factor
similarity index 100%
rename from basis/gstreamer/interfaces/interfaces.factor
rename to extra/gstreamer/interfaces/interfaces.factor
diff --git a/basis/gstreamer/net/GstNet-0.10.gir b/extra/gstreamer/net/GstNet-0.10.gir
similarity index 100%
rename from basis/gstreamer/net/GstNet-0.10.gir
rename to extra/gstreamer/net/GstNet-0.10.gir
diff --git a/basis/gstreamer/net/ffi/ffi.factor b/extra/gstreamer/net/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/net/ffi/ffi.factor
rename to extra/gstreamer/net/ffi/ffi.factor
diff --git a/basis/gstreamer/net/net.factor b/extra/gstreamer/net/net.factor
similarity index 100%
rename from basis/gstreamer/net/net.factor
rename to extra/gstreamer/net/net.factor
diff --git a/basis/gstreamer/netbuffer/GstNetbuffer-0.10.gir b/extra/gstreamer/netbuffer/GstNetbuffer-0.10.gir
similarity index 100%
rename from basis/gstreamer/netbuffer/GstNetbuffer-0.10.gir
rename to extra/gstreamer/netbuffer/GstNetbuffer-0.10.gir
diff --git a/basis/gstreamer/netbuffer/ffi/ffi.factor b/extra/gstreamer/netbuffer/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/netbuffer/ffi/ffi.factor
rename to extra/gstreamer/netbuffer/ffi/ffi.factor
diff --git a/basis/gstreamer/netbuffer/netbuffer.factor b/extra/gstreamer/netbuffer/netbuffer.factor
similarity index 100%
rename from basis/gstreamer/netbuffer/netbuffer.factor
rename to extra/gstreamer/netbuffer/netbuffer.factor
diff --git a/basis/gstreamer/pbutils/GstPbutils-0.10.gir b/extra/gstreamer/pbutils/GstPbutils-0.10.gir
similarity index 100%
rename from basis/gstreamer/pbutils/GstPbutils-0.10.gir
rename to extra/gstreamer/pbutils/GstPbutils-0.10.gir
diff --git a/basis/gstreamer/pbutils/ffi/ffi.factor b/extra/gstreamer/pbutils/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/pbutils/ffi/ffi.factor
rename to extra/gstreamer/pbutils/ffi/ffi.factor
diff --git a/basis/gstreamer/pbutils/pbutils.factor b/extra/gstreamer/pbutils/pbutils.factor
similarity index 100%
rename from basis/gstreamer/pbutils/pbutils.factor
rename to extra/gstreamer/pbutils/pbutils.factor
diff --git a/basis/gstreamer/riff/GstRiff-0.10.gir b/extra/gstreamer/riff/GstRiff-0.10.gir
similarity index 100%
rename from basis/gstreamer/riff/GstRiff-0.10.gir
rename to extra/gstreamer/riff/GstRiff-0.10.gir
diff --git a/basis/gstreamer/riff/ffi/ffi.factor b/extra/gstreamer/riff/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/riff/ffi/ffi.factor
rename to extra/gstreamer/riff/ffi/ffi.factor
diff --git a/basis/gstreamer/riff/riff.factor b/extra/gstreamer/riff/riff.factor
similarity index 100%
rename from basis/gstreamer/riff/riff.factor
rename to extra/gstreamer/riff/riff.factor
diff --git a/basis/gstreamer/rtp/GstRtp-0.10.gir b/extra/gstreamer/rtp/GstRtp-0.10.gir
similarity index 100%
rename from basis/gstreamer/rtp/GstRtp-0.10.gir
rename to extra/gstreamer/rtp/GstRtp-0.10.gir
diff --git a/basis/gstreamer/rtp/ffi/ffi.factor b/extra/gstreamer/rtp/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/rtp/ffi/ffi.factor
rename to extra/gstreamer/rtp/ffi/ffi.factor
diff --git a/basis/gstreamer/rtp/rtp.factor b/extra/gstreamer/rtp/rtp.factor
similarity index 100%
rename from basis/gstreamer/rtp/rtp.factor
rename to extra/gstreamer/rtp/rtp.factor
diff --git a/basis/gstreamer/rtsp/GstRtsp-0.10.gir b/extra/gstreamer/rtsp/GstRtsp-0.10.gir
similarity index 100%
rename from basis/gstreamer/rtsp/GstRtsp-0.10.gir
rename to extra/gstreamer/rtsp/GstRtsp-0.10.gir
diff --git a/basis/gstreamer/rtsp/ffi/ffi.factor b/extra/gstreamer/rtsp/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/rtsp/ffi/ffi.factor
rename to extra/gstreamer/rtsp/ffi/ffi.factor
diff --git a/basis/gstreamer/rtsp/rtsp.factor b/extra/gstreamer/rtsp/rtsp.factor
similarity index 100%
rename from basis/gstreamer/rtsp/rtsp.factor
rename to extra/gstreamer/rtsp/rtsp.factor
diff --git a/basis/gstreamer/sdp/GstSdp-0.10.gir b/extra/gstreamer/sdp/GstSdp-0.10.gir
similarity index 100%
rename from basis/gstreamer/sdp/GstSdp-0.10.gir
rename to extra/gstreamer/sdp/GstSdp-0.10.gir
diff --git a/basis/gstreamer/sdp/ffi/ffi.factor b/extra/gstreamer/sdp/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/sdp/ffi/ffi.factor
rename to extra/gstreamer/sdp/ffi/ffi.factor
diff --git a/basis/gstreamer/sdp/sdp.factor b/extra/gstreamer/sdp/sdp.factor
similarity index 100%
rename from basis/gstreamer/sdp/sdp.factor
rename to extra/gstreamer/sdp/sdp.factor
diff --git a/basis/gstreamer/summary.txt b/extra/gstreamer/summary.txt
similarity index 100%
rename from basis/gstreamer/summary.txt
rename to extra/gstreamer/summary.txt
diff --git a/basis/gstreamer/tag/GstTag-0.10.gir b/extra/gstreamer/tag/GstTag-0.10.gir
similarity index 100%
rename from basis/gstreamer/tag/GstTag-0.10.gir
rename to extra/gstreamer/tag/GstTag-0.10.gir
diff --git a/basis/gstreamer/tag/ffi/ffi.factor b/extra/gstreamer/tag/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/tag/ffi/ffi.factor
rename to extra/gstreamer/tag/ffi/ffi.factor
diff --git a/basis/gstreamer/tag/tag.factor b/extra/gstreamer/tag/tag.factor
similarity index 100%
rename from basis/gstreamer/tag/tag.factor
rename to extra/gstreamer/tag/tag.factor
diff --git a/basis/gstreamer/tags.txt b/extra/gstreamer/tags.txt
similarity index 100%
rename from basis/gstreamer/tags.txt
rename to extra/gstreamer/tags.txt
diff --git a/basis/gstreamer/video/GstVideo-0.10.gir b/extra/gstreamer/video/GstVideo-0.10.gir
similarity index 100%
rename from basis/gstreamer/video/GstVideo-0.10.gir
rename to extra/gstreamer/video/GstVideo-0.10.gir
diff --git a/basis/gstreamer/video/ffi/ffi.factor b/extra/gstreamer/video/ffi/ffi.factor
similarity index 100%
rename from basis/gstreamer/video/ffi/ffi.factor
rename to extra/gstreamer/video/ffi/ffi.factor
diff --git a/basis/gstreamer/video/video.factor b/extra/gstreamer/video/video.factor
similarity index 100%
rename from basis/gstreamer/video/video.factor
rename to extra/gstreamer/video/video.factor