diff --git a/hongweiz/adcapp/LICENSE b/adcapp/LICENSE
similarity index 100%
rename from hongweiz/adcapp/LICENSE
rename to adcapp/LICENSE
diff --git a/hongweiz/adcapp/Makefile.am b/adcapp/Makefile.am
similarity index 100%
rename from hongweiz/adcapp/Makefile.am
rename to adcapp/Makefile.am
diff --git a/hongweiz/adcapp/README b/adcapp/README
similarity index 100%
rename from hongweiz/adcapp/README
rename to adcapp/README
diff --git a/hongweiz/adcapp/configure.ac b/adcapp/configure.ac
similarity index 100%
rename from hongweiz/adcapp/configure.ac
rename to adcapp/configure.ac
diff --git a/hongweiz/adcapp/src/EINTR_wrappers.c b/adcapp/src/EINTR_wrappers.c
similarity index 100%
rename from hongweiz/adcapp/src/EINTR_wrappers.c
rename to adcapp/src/EINTR_wrappers.c
diff --git a/hongweiz/adcapp/src/EINTR_wrappers.h b/adcapp/src/EINTR_wrappers.h
similarity index 100%
rename from hongweiz/adcapp/src/EINTR_wrappers.h
rename to adcapp/src/EINTR_wrappers.h
diff --git a/hongweiz/adcapp/src/Makefile.am b/adcapp/src/Makefile.am
similarity index 100%
rename from hongweiz/adcapp/src/Makefile.am
rename to adcapp/src/Makefile.am
diff --git a/hongweiz/adcapp/src/adc.h b/adcapp/src/adc.h
similarity index 100%
rename from hongweiz/adcapp/src/adc.h
rename to adcapp/src/adc.h
diff --git a/hongweiz/adcapp/src/adcapp.c b/adcapp/src/adcapp.c
similarity index 100%
rename from hongweiz/adcapp/src/adcapp.c
rename to adcapp/src/adcapp.c
diff --git a/hongweiz/adcapp/src/adcifc.c b/adcapp/src/adcifc.c
similarity index 100%
rename from hongweiz/adcapp/src/adcifc.c
rename to adcapp/src/adcifc.c
diff --git a/hongweiz/adcapp/src/adcifc.h b/adcapp/src/adcifc.h
similarity index 100%
rename from hongweiz/adcapp/src/adcifc.h
rename to adcapp/src/adcifc.h
diff --git a/amboar/obmc-scripts/altitude/altitude b/altitude/altitude
similarity index 100%
rename from amboar/obmc-scripts/altitude/altitude
rename to altitude/altitude
diff --git a/amboar/obmc-scripts/LICENSE b/amboar/obmc-scripts/LICENSE
deleted file mode 100644
index 78e3d2c..0000000
--- a/amboar/obmc-scripts/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright 2017 IBM Corp.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/feistjj/autojson/autojson.py b/autojson/autojson.py
similarity index 100%
rename from feistjj/autojson/autojson.py
rename to autojson/autojson.py
diff --git a/amboar/obmc-scripts/bi2cp/README.md b/bi2cp/README.md
similarity index 100%
rename from amboar/obmc-scripts/bi2cp/README.md
rename to bi2cp/README.md
diff --git a/amboar/obmc-scripts/bi2cp/bi2cp b/bi2cp/bi2cp
similarity index 100%
rename from amboar/obmc-scripts/bi2cp/bi2cp
rename to bi2cp/bi2cp
diff --git a/amboar/obmc-scripts/bi2cp/requirements.txt b/bi2cp/requirements.txt
similarity index 100%
rename from amboar/obmc-scripts/bi2cp/requirements.txt
rename to bi2cp/requirements.txt
diff --git a/emilyshaffer/cla-signers/README.md b/cla-signers/README.md
similarity index 100%
rename from emilyshaffer/cla-signers/README.md
rename to cla-signers/README.md
diff --git a/emilyshaffer/cla-signers/update-cla.sh b/cla-signers/update-cla.sh
similarity index 100%
rename from emilyshaffer/cla-signers/update-cla.sh
rename to cla-signers/update-cla.sh
diff --git a/amboar/obmc-scripts/dbus-pcap/README.md b/dbus-pcap/README.md
similarity index 100%
rename from amboar/obmc-scripts/dbus-pcap/README.md
rename to dbus-pcap/README.md
diff --git a/amboar/obmc-scripts/dbus-pcap/dbus-pcap b/dbus-pcap/dbus-pcap
similarity index 100%
rename from amboar/obmc-scripts/dbus-pcap/dbus-pcap
rename to dbus-pcap/dbus-pcap
diff --git a/amboar/obmc-scripts/dbus-pcap/requirements.txt b/dbus-pcap/requirements.txt
similarity index 100%
rename from amboar/obmc-scripts/dbus-pcap/requirements.txt
rename to dbus-pcap/requirements.txt
diff --git a/amboar/obmc-scripts/ddconvnotrunc/ddconvnotrunc b/ddconvnotrunc/ddconvnotrunc
similarity index 100%
rename from amboar/obmc-scripts/ddconvnotrunc/ddconvnotrunc
rename to ddconvnotrunc/ddconvnotrunc
diff --git a/geissonator/format-yaml/LICENSE b/format-yaml/LICENSE
similarity index 100%
rename from geissonator/format-yaml/LICENSE
rename to format-yaml/LICENSE
diff --git a/geissonator/format-yaml/format-yaml.py b/format-yaml/format-yaml.py
similarity index 100%
rename from geissonator/format-yaml/format-yaml.py
rename to format-yaml/format-yaml.py
diff --git a/amboar/obmc-scripts/maintainers/README.md b/maintainers/README.md
similarity index 100%
rename from amboar/obmc-scripts/maintainers/README.md
rename to maintainers/README.md
diff --git a/amboar/obmc-scripts/maintainers/obmc-gerrit b/maintainers/obmc-gerrit
similarity index 100%
rename from amboar/obmc-scripts/maintainers/obmc-gerrit
rename to maintainers/obmc-gerrit
diff --git a/amboar/obmc-scripts/maintainers/obmc/__init__.py b/maintainers/obmc/__init__.py
similarity index 100%
rename from amboar/obmc-scripts/maintainers/obmc/__init__.py
rename to maintainers/obmc/__init__.py
diff --git a/amboar/obmc-scripts/maintainers/obmc/maintainers.py b/maintainers/obmc/maintainers.py
similarity index 100%
rename from amboar/obmc-scripts/maintainers/obmc/maintainers.py
rename to maintainers/obmc/maintainers.py
diff --git a/amboar/obmc-scripts/maintainers/requirements.txt b/maintainers/requirements.txt
similarity index 100%
rename from amboar/obmc-scripts/maintainers/requirements.txt
rename to maintainers/requirements.txt
diff --git a/amboar/obmc-scripts/maintainers/setup.py b/maintainers/setup.py
similarity index 100%
rename from amboar/obmc-scripts/maintainers/setup.py
rename to maintainers/setup.py
diff --git a/amboar/obmc-scripts/maintainers/split_maintainers.py b/maintainers/split_maintainers.py
similarity index 100%
rename from amboar/obmc-scripts/maintainers/split_maintainers.py
rename to maintainers/split_maintainers.py
diff --git a/amboar/obmc-scripts/netboot/README.md b/netboot/README.md
similarity index 100%
rename from amboar/obmc-scripts/netboot/README.md
rename to netboot/README.md
diff --git a/amboar/obmc-scripts/netboot/netboot b/netboot/netboot
similarity index 100%
rename from amboar/obmc-scripts/netboot/netboot
rename to netboot/netboot
diff --git a/infra/openbmc-autobump/openbmc-autobump.py b/openbmc-autobump/openbmc-autobump.py
similarity index 100%
rename from infra/openbmc-autobump/openbmc-autobump.py
rename to openbmc-autobump/openbmc-autobump.py
diff --git a/geissonator/openbmc-events/LICENSE b/openbmc-events/LICENSE
similarity index 100%
rename from geissonator/openbmc-events/LICENSE
rename to openbmc-events/LICENSE
diff --git a/geissonator/openbmc-events/README.md b/openbmc-events/README.md
similarity index 100%
rename from geissonator/openbmc-events/README.md
rename to openbmc-events/README.md
diff --git a/geissonator/openbmc-events/openbmc-events b/openbmc-events/openbmc-events
similarity index 100%
rename from geissonator/openbmc-events/openbmc-events
rename to openbmc-events/openbmc-events
diff --git a/geissonator/openbmc-events/openbmc-sensors b/openbmc-events/openbmc-sensors
similarity index 100%
rename from geissonator/openbmc-events/openbmc-sensors
rename to openbmc-events/openbmc-sensors
diff --git a/geissonator/openbmc-events/openbmc-sfw b/openbmc-events/openbmc-sfw
similarity index 100%
rename from geissonator/openbmc-events/openbmc-sfw
rename to openbmc-events/openbmc-sfw
diff --git a/hongweiz/pwmtachtool/LICENSE b/pwmtachtool/LICENSE
similarity index 100%
rename from hongweiz/pwmtachtool/LICENSE
rename to pwmtachtool/LICENSE
diff --git a/hongweiz/pwmtachtool/Makefile.am b/pwmtachtool/Makefile.am
similarity index 100%
rename from hongweiz/pwmtachtool/Makefile.am
rename to pwmtachtool/Makefile.am
diff --git a/hongweiz/pwmtachtool/README b/pwmtachtool/README
similarity index 100%
rename from hongweiz/pwmtachtool/README
rename to pwmtachtool/README
diff --git a/hongweiz/pwmtachtool/configure.ac b/pwmtachtool/configure.ac
similarity index 100%
rename from hongweiz/pwmtachtool/configure.ac
rename to pwmtachtool/configure.ac
diff --git a/hongweiz/pwmtachtool/src/EINTR_wrappers.c b/pwmtachtool/src/EINTR_wrappers.c
similarity index 100%
rename from hongweiz/pwmtachtool/src/EINTR_wrappers.c
rename to pwmtachtool/src/EINTR_wrappers.c
diff --git a/hongweiz/pwmtachtool/src/EINTR_wrappers.h b/pwmtachtool/src/EINTR_wrappers.h
similarity index 100%
rename from hongweiz/pwmtachtool/src/EINTR_wrappers.h
rename to pwmtachtool/src/EINTR_wrappers.h
diff --git a/hongweiz/pwmtachtool/src/Makefile.am b/pwmtachtool/src/Makefile.am
similarity index 100%
rename from hongweiz/pwmtachtool/src/Makefile.am
rename to pwmtachtool/src/Makefile.am
diff --git a/hongweiz/pwmtachtool/src/libpwmtach.h b/pwmtachtool/src/libpwmtach.h
similarity index 100%
rename from hongweiz/pwmtachtool/src/libpwmtach.h
rename to pwmtachtool/src/libpwmtach.h
diff --git a/hongweiz/pwmtachtool/src/pwmtach.c b/pwmtachtool/src/pwmtach.c
similarity index 100%
rename from hongweiz/pwmtachtool/src/pwmtach.c
rename to pwmtachtool/src/pwmtach.c
diff --git a/hongweiz/pwmtachtool/src/pwmtach_ioctl.h b/pwmtachtool/src/pwmtach_ioctl.h
similarity index 100%
rename from hongweiz/pwmtachtool/src/pwmtach_ioctl.h
rename to pwmtachtool/src/pwmtach_ioctl.h
diff --git a/hongweiz/pwmtachtool/src/pwmtachtool.c b/pwmtachtool/src/pwmtachtool.c
similarity index 100%
rename from hongweiz/pwmtachtool/src/pwmtachtool.c
rename to pwmtachtool/src/pwmtachtool.c
diff --git a/amboar/obmc-scripts/reboot-ping-pong/requirements.txt b/reboot-ping-pong/requirements.txt
similarity index 100%
rename from amboar/obmc-scripts/reboot-ping-pong/requirements.txt
rename to reboot-ping-pong/requirements.txt
diff --git a/amboar/obmc-scripts/reboot-ping-pong/rpp b/reboot-ping-pong/rpp
similarity index 100%
rename from amboar/obmc-scripts/reboot-ping-pong/rpp
rename to reboot-ping-pong/rpp
diff --git a/amboar/obmc-scripts/reboot/petitboot.exp b/reboot/petitboot.exp
similarity index 100%
rename from amboar/obmc-scripts/reboot/petitboot.exp
rename to reboot/petitboot.exp
diff --git a/amboar/obmc-scripts/reboot/reboot.sh b/reboot/reboot.sh
similarity index 100%
rename from amboar/obmc-scripts/reboot/reboot.sh
rename to reboot/reboot.sh
diff --git a/edtanous/rootfs_size/results.txt b/rootfs_size/results.txt
similarity index 100%
rename from edtanous/rootfs_size/results.txt
rename to rootfs_size/results.txt
diff --git a/edtanous/rootfs_size/rootfs_size.py b/rootfs_size/rootfs_size.py
similarity index 100%
rename from edtanous/rootfs_size/rootfs_size.py
rename to rootfs_size/rootfs_size.py
diff --git a/leiyu/obmc-utils/sensor_yaml_config/LICENSE b/sensor_yaml_config/LICENSE
similarity index 100%
rename from leiyu/obmc-utils/sensor_yaml_config/LICENSE
rename to sensor_yaml_config/LICENSE
diff --git a/leiyu/obmc-utils/sensor_yaml_config/README.md b/sensor_yaml_config/README.md
similarity index 100%
rename from leiyu/obmc-utils/sensor_yaml_config/README.md
rename to sensor_yaml_config/README.md
diff --git a/leiyu/obmc-utils/sensor_yaml_config/sensor_map.yaml b/sensor_yaml_config/sensor_map.yaml
similarity index 100%
rename from leiyu/obmc-utils/sensor_yaml_config/sensor_map.yaml
rename to sensor_yaml_config/sensor_map.yaml
diff --git a/leiyu/obmc-utils/sensor_yaml_config/sensor_yaml_config.py b/sensor_yaml_config/sensor_yaml_config.py
similarity index 100%
rename from leiyu/obmc-utils/sensor_yaml_config/sensor_yaml_config.py
rename to sensor_yaml_config/sensor_yaml_config.py
diff --git a/amboar/obmc-scripts/tracing/README.md b/tracing/README.md
similarity index 100%
rename from amboar/obmc-scripts/tracing/README.md
rename to tracing/README.md
diff --git a/amboar/obmc-scripts/tracing/trace b/tracing/trace
similarity index 100%
rename from amboar/obmc-scripts/tracing/trace
rename to tracing/trace
diff --git a/leiyu/obmc-utils/upload_and_update/LICENSE b/upload_and_update/LICENSE
similarity index 100%
rename from leiyu/obmc-utils/upload_and_update/LICENSE
rename to upload_and_update/LICENSE
diff --git a/leiyu/obmc-utils/upload_and_update/README.md b/upload_and_update/README.md
similarity index 100%
rename from leiyu/obmc-utils/upload_and_update/README.md
rename to upload_and_update/README.md
diff --git a/leiyu/obmc-utils/upload_and_update/upload_and_update.py b/upload_and_update/upload_and_update.py
similarity index 100%
rename from leiyu/obmc-utils/upload_and_update/upload_and_update.py
rename to upload_and_update/upload_and_update.py
diff --git a/amboar/obmc-scripts/witherspoon-debug/README.md b/witherspoon-debug/README.md
similarity index 100%
rename from amboar/obmc-scripts/witherspoon-debug/README.md
rename to witherspoon-debug/README.md
diff --git a/amboar/obmc-scripts/witherspoon-debug/debug b/witherspoon-debug/debug
similarity index 100%
rename from amboar/obmc-scripts/witherspoon-debug/debug
rename to witherspoon-debug/debug
diff --git a/amboar/obmc-scripts/witherspoon-debug/libncurses.so.5.9 b/witherspoon-debug/libncurses.so.5.9
similarity index 100%
rename from amboar/obmc-scripts/witherspoon-debug/libncurses.so.5.9
rename to witherspoon-debug/libncurses.so.5.9
Binary files differ
diff --git a/amboar/obmc-scripts/witherspoon-debug/libncursesw.so.5.9 b/witherspoon-debug/libncursesw.so.5.9
similarity index 100%
rename from amboar/obmc-scripts/witherspoon-debug/libncursesw.so.5.9
rename to witherspoon-debug/libncursesw.so.5.9
Binary files differ