diff --git a/bundles/org.openhab.binding.keba/.gitignore b/bundles/org.openhab.binding.keba/.gitignore
new file mode 100644
index 00000000000..00d2ab71ddb
--- /dev/null
+++ b/bundles/org.openhab.binding.keba/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/bundles/org.openhab.binding.webthing/README.md b/bundles/org.openhab.binding.webthing/README.md
index 0de308663f9..2961f799061 100644
--- a/bundles/org.openhab.binding.webthing/README.md
+++ b/bundles/org.openhab.binding.webthing/README.md
@@ -54,12 +54,12 @@ This service does not require specific hardware or devices. To connect the WebTh
 
 After installing the WebThing binding you should find the WebThings of your network in the things section of your openHAB administration interface as shown below.
  
-![discovery picture](docs/discovery.png) 
+![discovery picture](doc/discovery.png) 
 
 Here, the WebThings provided by the *Internet Monitor Service*: the *Internet Connectivity* WebThing as well as the 
 *Internet Speed Monitor* WebThing have been discovered. To add a WebThing as an openHAB Thing click the 'Add as Thing' button. 
 
-![discovery picture](docs/speedmonitor.png) 
+![discovery picture](doc/speedmonitor.png) 
 
 Alternatively, you may add the WebThing as a openHAB Thing by using a webthing.thing file that has to be located inside the things folder.  
 
@@ -73,7 +73,7 @@ the connectivity WebThing URI path ends with '/1' in this example.
 
 Due to the fact that the WebThing API is based on web technologies, you can validate the WebThing description by opening the WebThing uri in a browser.   
  
-![webthing picture](docs/webthing_description.png) 
+![webthing picture](doc/webthing_description.png) 
  
 ### Items   
 
@@ -82,7 +82,7 @@ For each property of the WebThing a dedicated openHAB channel will be created, a
 as *webthing:generic:speedmonitor:uploadspeed* is the combination of the thingUID *webthing:generic* and the 
 WebThing property name *uploadspeed*. 
 
-![channels picture](docs/channels.png) 
+![channels picture](doc/channels.png) 
 
 These channels may be linked via the channels tab of the graphical user interface or manually via a webthing.items file as shown below
 
@@ -103,4 +103,4 @@ sitemap internetmonitor label="Internet Speed Monitor" {
 }
 ```
 
-![sitemap picture](docs/sitemap.png) 
+![sitemap picture](doc/sitemap.png) 
diff --git a/bundles/org.openhab.binding.webthing/docs/channels.png b/bundles/org.openhab.binding.webthing/doc/channels.png
similarity index 100%
rename from bundles/org.openhab.binding.webthing/docs/channels.png
rename to bundles/org.openhab.binding.webthing/doc/channels.png
diff --git a/bundles/org.openhab.binding.webthing/docs/discovery.png b/bundles/org.openhab.binding.webthing/doc/discovery.png
similarity index 100%
rename from bundles/org.openhab.binding.webthing/docs/discovery.png
rename to bundles/org.openhab.binding.webthing/doc/discovery.png
diff --git a/bundles/org.openhab.binding.webthing/docs/sitemap.png b/bundles/org.openhab.binding.webthing/doc/sitemap.png
similarity index 100%
rename from bundles/org.openhab.binding.webthing/docs/sitemap.png
rename to bundles/org.openhab.binding.webthing/doc/sitemap.png
diff --git a/bundles/org.openhab.binding.webthing/docs/speedmonitor.png b/bundles/org.openhab.binding.webthing/doc/speedmonitor.png
similarity index 100%
rename from bundles/org.openhab.binding.webthing/docs/speedmonitor.png
rename to bundles/org.openhab.binding.webthing/doc/speedmonitor.png
diff --git a/bundles/org.openhab.binding.webthing/docs/webthing_description.png b/bundles/org.openhab.binding.webthing/doc/webthing_description.png
similarity index 100%
rename from bundles/org.openhab.binding.webthing/docs/webthing_description.png
rename to bundles/org.openhab.binding.webthing/doc/webthing_description.png
diff --git a/bundles/org.openhab.io.metrics/README.md b/bundles/org.openhab.io.metrics/README.md
index 52abf261f01..2f5c9cfa633 100644
--- a/bundles/org.openhab.io.metrics/README.md
+++ b/bundles/org.openhab.io.metrics/README.md
@@ -94,6 +94,6 @@ This has been tested with Prometheus - for other monitoring systems adaptions to
 
 Here are some screenshots: 
 
-![Grafana (1)](docs/grafana-1.png)
-![Grafana (2)](docs/grafana-2.png)
-![Grafana (3)](docs/grafana-3.png)
+![Grafana (1)](doc/grafana-1.png)
+![Grafana (2)](doc/grafana-2.png)
+![Grafana (3)](doc/grafana-3.png)
diff --git a/bundles/org.openhab.io.metrics/docs/dashboard.json b/bundles/org.openhab.io.metrics/doc/dashboard.json
similarity index 100%
rename from bundles/org.openhab.io.metrics/docs/dashboard.json
rename to bundles/org.openhab.io.metrics/doc/dashboard.json
diff --git a/bundles/org.openhab.io.metrics/docs/grafana-1.png b/bundles/org.openhab.io.metrics/doc/grafana-1.png
similarity index 100%
rename from bundles/org.openhab.io.metrics/docs/grafana-1.png
rename to bundles/org.openhab.io.metrics/doc/grafana-1.png
diff --git a/bundles/org.openhab.io.metrics/docs/grafana-2.png b/bundles/org.openhab.io.metrics/doc/grafana-2.png
similarity index 100%
rename from bundles/org.openhab.io.metrics/docs/grafana-2.png
rename to bundles/org.openhab.io.metrics/doc/grafana-2.png
diff --git a/bundles/org.openhab.io.metrics/docs/grafana-3.png b/bundles/org.openhab.io.metrics/doc/grafana-3.png
similarity index 100%
rename from bundles/org.openhab.io.metrics/docs/grafana-3.png
rename to bundles/org.openhab.io.metrics/doc/grafana-3.png