diff --git a/markdown/index.md b/markdown/index.md
index 0cbe404b7b..dcdcf2d6e0 100644
--- a/markdown/index.md
+++ b/markdown/index.md
@@ -10,7 +10,7 @@ all about.
* [Application Development Manual (Read this first)](application-development/index.md)
* [Frequently Asked Questions](frequently-asked-questions/index.md)
- * [](pwg/index.md)
+ * [Plugin Writer's Guide](plugin-development/index.md)
* Core Reference
* Core Libraries Reference/a>
* [Core Design Documentation](http://cgit.freedesktop.org/gstreamer/gstreamer/tree/docs/design/)
diff --git a/markdown/pwg/advanced/allocation.md b/markdown/plugin-development/advanced/allocation.md
similarity index 100%
rename from markdown/pwg/advanced/allocation.md
rename to markdown/plugin-development/advanced/allocation.md
diff --git a/markdown/pwg/advanced/building-types.md b/markdown/plugin-development/advanced/building-types.md
similarity index 100%
rename from markdown/pwg/advanced/building-types.md
rename to markdown/plugin-development/advanced/building-types.md
diff --git a/markdown/pwg/advanced/clock.md b/markdown/plugin-development/advanced/clock.md
similarity index 100%
rename from markdown/pwg/advanced/clock.md
rename to markdown/plugin-development/advanced/clock.md
diff --git a/markdown/pwg/advanced/dparams.md b/markdown/plugin-development/advanced/dparams.md
similarity index 100%
rename from markdown/pwg/advanced/dparams.md
rename to markdown/plugin-development/advanced/dparams.md
diff --git a/markdown/pwg/advanced/events.md b/markdown/plugin-development/advanced/events.md
similarity index 100%
rename from markdown/pwg/advanced/events.md
rename to markdown/plugin-development/advanced/events.md
diff --git a/markdown/pwg/advanced/index.md b/markdown/plugin-development/advanced/index.md
similarity index 100%
rename from markdown/pwg/advanced/index.md
rename to markdown/plugin-development/advanced/index.md
diff --git a/markdown/pwg/advanced/interfaces.md b/markdown/plugin-development/advanced/interfaces.md
similarity index 100%
rename from markdown/pwg/advanced/interfaces.md
rename to markdown/plugin-development/advanced/interfaces.md
diff --git a/markdown/pwg/advanced/negotiation.md b/markdown/plugin-development/advanced/negotiation.md
similarity index 100%
rename from markdown/pwg/advanced/negotiation.md
rename to markdown/plugin-development/advanced/negotiation.md
diff --git a/markdown/pwg/advanced/qos.md b/markdown/plugin-development/advanced/qos.md
similarity index 100%
rename from markdown/pwg/advanced/qos.md
rename to markdown/plugin-development/advanced/qos.md
diff --git a/markdown/pwg/advanced/request.md b/markdown/plugin-development/advanced/request.md
similarity index 100%
rename from markdown/pwg/advanced/request.md
rename to markdown/plugin-development/advanced/request.md
diff --git a/markdown/pwg/advanced/scheduling.md b/markdown/plugin-development/advanced/scheduling.md
similarity index 100%
rename from markdown/pwg/advanced/scheduling.md
rename to markdown/plugin-development/advanced/scheduling.md
diff --git a/markdown/pwg/advanced/tagging.md b/markdown/plugin-development/advanced/tagging.md
similarity index 100%
rename from markdown/pwg/advanced/tagging.md
rename to markdown/plugin-development/advanced/tagging.md
diff --git a/markdown/pwg/appendix/checklist-element.md b/markdown/plugin-development/appendix/checklist-element.md
similarity index 100%
rename from markdown/pwg/appendix/checklist-element.md
rename to markdown/plugin-development/appendix/checklist-element.md
diff --git a/markdown/pwg/appendix/index.md b/markdown/plugin-development/appendix/index.md
similarity index 100%
rename from markdown/pwg/appendix/index.md
rename to markdown/plugin-development/appendix/index.md
diff --git a/markdown/pwg/appendix/licensing-advisory.md b/markdown/plugin-development/appendix/licensing-advisory.md
similarity index 100%
rename from markdown/pwg/appendix/licensing-advisory.md
rename to markdown/plugin-development/appendix/licensing-advisory.md
diff --git a/markdown/pwg/appendix/porting-1_0.md b/markdown/plugin-development/appendix/porting-1_0.md
similarity index 100%
rename from markdown/pwg/appendix/porting-1_0.md
rename to markdown/plugin-development/appendix/porting-1_0.md
diff --git a/markdown/pwg/appendix/porting.md b/markdown/plugin-development/appendix/porting.md
similarity index 100%
rename from markdown/pwg/appendix/porting.md
rename to markdown/plugin-development/appendix/porting.md
diff --git a/markdown/pwg/building/args.md b/markdown/plugin-development/building/args.md
similarity index 100%
rename from markdown/pwg/building/args.md
rename to markdown/plugin-development/building/args.md
diff --git a/markdown/pwg/building/boiler.md b/markdown/plugin-development/building/boiler.md
similarity index 100%
rename from markdown/pwg/building/boiler.md
rename to markdown/plugin-development/building/boiler.md
diff --git a/markdown/pwg/building/chainfn.md b/markdown/plugin-development/building/chainfn.md
similarity index 100%
rename from markdown/pwg/building/chainfn.md
rename to markdown/plugin-development/building/chainfn.md
diff --git a/markdown/pwg/building/eventfn.md b/markdown/plugin-development/building/eventfn.md
similarity index 100%
rename from markdown/pwg/building/eventfn.md
rename to markdown/plugin-development/building/eventfn.md
diff --git a/markdown/pwg/building/index.md b/markdown/plugin-development/building/index.md
similarity index 100%
rename from markdown/pwg/building/index.md
rename to markdown/plugin-development/building/index.md
diff --git a/markdown/pwg/building/pads.md b/markdown/plugin-development/building/pads.md
similarity index 100%
rename from markdown/pwg/building/pads.md
rename to markdown/plugin-development/building/pads.md
diff --git a/markdown/pwg/building/queryfn.md b/markdown/plugin-development/building/queryfn.md
similarity index 100%
rename from markdown/pwg/building/queryfn.md
rename to markdown/plugin-development/building/queryfn.md
diff --git a/markdown/pwg/building/signals.md b/markdown/plugin-development/building/signals.md
similarity index 100%
rename from markdown/pwg/building/signals.md
rename to markdown/plugin-development/building/signals.md
diff --git a/markdown/pwg/building/statemanage-states.md b/markdown/plugin-development/building/statemanage-states.md
similarity index 100%
rename from markdown/pwg/building/statemanage-states.md
rename to markdown/plugin-development/building/statemanage-states.md
diff --git a/markdown/pwg/building/testapp.md b/markdown/plugin-development/building/testapp.md
similarity index 100%
rename from markdown/pwg/building/testapp.md
rename to markdown/plugin-development/building/testapp.md
diff --git a/markdown/pwg/index.md b/markdown/plugin-development/index.md
similarity index 100%
rename from markdown/pwg/index.md
rename to markdown/plugin-development/index.md
diff --git a/markdown/pwg/introduction/basics.md b/markdown/plugin-development/introduction/basics.md
similarity index 100%
rename from markdown/pwg/introduction/basics.md
rename to markdown/plugin-development/introduction/basics.md
diff --git a/markdown/pwg/introduction/index.md b/markdown/plugin-development/introduction/index.md
similarity index 100%
rename from markdown/pwg/introduction/index.md
rename to markdown/plugin-development/introduction/index.md
diff --git a/markdown/pwg/introduction/preface.md b/markdown/plugin-development/introduction/preface.md
similarity index 100%
rename from markdown/pwg/introduction/preface.md
rename to markdown/plugin-development/introduction/preface.md
diff --git a/markdown/pwg/other/base.md b/markdown/plugin-development/other/base.md
similarity index 100%
rename from markdown/pwg/other/base.md
rename to markdown/plugin-development/other/base.md
diff --git a/markdown/pwg/other/index.md b/markdown/plugin-development/other/index.md
similarity index 100%
rename from markdown/pwg/other/index.md
rename to markdown/plugin-development/other/index.md
diff --git a/markdown/pwg/other/manager.md b/markdown/plugin-development/other/manager.md
similarity index 100%
rename from markdown/pwg/other/manager.md
rename to markdown/plugin-development/other/manager.md
diff --git a/markdown/pwg/other/ntoone.md b/markdown/plugin-development/other/ntoone.md
similarity index 100%
rename from markdown/pwg/other/ntoone.md
rename to markdown/plugin-development/other/ntoone.md
diff --git a/markdown/pwg/other/oneton.md b/markdown/plugin-development/other/oneton.md
similarity index 100%
rename from markdown/pwg/other/oneton.md
rename to markdown/plugin-development/other/oneton.md
diff --git a/sitemap.txt b/sitemap.txt
index 7d86358a0f..7683afb4cd 100644
--- a/sitemap.txt
+++ b/sitemap.txt
@@ -97,41 +97,41 @@ index.md
tools/gst-inspect.md
tools/gst-launch.md
tools/ges-launch.md
- pwg/index.md
- pwg/introduction/index.md
- pwg/introduction/preface.md
- pwg/introduction/basics.md
- pwg/building/index.md
- pwg/building/boiler.md
- pwg/building/pads.md
- pwg/building/chainfn.md
- pwg/building/eventfn.md
- pwg/building/queryfn.md
- pwg/building/statemanage-states.md
- pwg/building/args.md
- pwg/building/signals.md
- pwg/building/testapp.md
- pwg/advanced/index.md
- pwg/advanced/request.md
- pwg/advanced/scheduling.md
- pwg/advanced/negotiation.md
- pwg/advanced/allocation.md
- pwg/advanced/building-types.md
- pwg/advanced/events.md
- pwg/advanced/clock.md
- pwg/advanced/qos.md
- pwg/advanced/dparams.md
- pwg/advanced/interfaces.md
- pwg/advanced/tagging.md
- pwg/other/index.md
- pwg/other/base.md
- pwg/other/oneton.md
- pwg/other/ntoone.md
- pwg/other/manager.md
- pwg/appendix/index.md
- pwg/appendix/checklist-element.md
- pwg/appendix/porting.md
- pwg/appendix/porting-1_0.md
- pwg/appendix/licensing-advisory.md
+ plugin-development/index.md
+ plugin-development/introduction/index.md
+ plugin-development/introduction/preface.md
+ plugin-development/introduction/basics.md
+ plugin-development/building/index.md
+ plugin-development/building/boiler.md
+ plugin-development/building/pads.md
+ plugin-development/building/chainfn.md
+ plugin-development/building/eventfn.md
+ plugin-development/building/queryfn.md
+ plugin-development/building/statemanage-states.md
+ plugin-development/building/args.md
+ plugin-development/building/signals.md
+ plugin-development/building/testapp.md
+ plugin-development/advanced/index.md
+ plugin-development/advanced/request.md
+ plugin-development/advanced/scheduling.md
+ plugin-development/advanced/negotiation.md
+ plugin-development/advanced/allocation.md
+ plugin-development/advanced/building-types.md
+ plugin-development/advanced/events.md
+ plugin-development/advanced/clock.md
+ plugin-development/advanced/qos.md
+ plugin-development/advanced/dparams.md
+ plugin-development/advanced/interfaces.md
+ plugin-development/advanced/tagging.md
+ plugin-development/other/index.md
+ plugin-development/other/base.md
+ plugin-development/other/oneton.md
+ plugin-development/other/ntoone.md
+ plugin-development/other/manager.md
+ plugin-development/appendix/index.md
+ plugin-development/appendix/checklist-element.md
+ plugin-development/appendix/porting.md
+ plugin-development/appendix/porting-1_0.md
+ plugin-development/appendix/licensing-advisory.md
splitup.md
rtp.md