diff --git a/contrib/cleanup/tab2spaces.sh b/opt/cleanup/tab2spaces.sh
similarity index 100%
rename from contrib/cleanup/tab2spaces.sh
rename to opt/cleanup/tab2spaces.sh
diff --git a/contrib/cleanup/whitespace.sh b/opt/cleanup/whitespace.sh
similarity index 100%
rename from contrib/cleanup/whitespace.sh
rename to opt/cleanup/whitespace.sh
diff --git a/contrib/conf_merge/README b/opt/conf_merge/README
similarity index 100%
rename from contrib/conf_merge/README
rename to opt/conf_merge/README
diff --git a/contrib/conf_merge/index.php b/opt/conf_merge/index.php
similarity index 100%
rename from contrib/conf_merge/index.php
rename to opt/conf_merge/index.php
diff --git a/contrib/conf_merge/merge.php b/opt/conf_merge/merge.php
similarity index 100%
rename from contrib/conf_merge/merge.php
rename to opt/conf_merge/merge.php