diff --git a/chipsets/cc256x/.gitignore b/chipset/cc256x/.gitignore
similarity index 100%
rename from chipsets/cc256x/.gitignore
rename to chipset/cc256x/.gitignore
diff --git a/chipsets/cc256x/Makefile.inc b/chipset/cc256x/Makefile.inc
similarity index 100%
rename from chipsets/cc256x/Makefile.inc
rename to chipset/cc256x/Makefile.inc
diff --git a/chipsets/cc256x/ant_cmds.c b/chipset/cc256x/ant_cmds.c
similarity index 100%
rename from chipsets/cc256x/ant_cmds.c
rename to chipset/cc256x/ant_cmds.c
diff --git a/chipsets/cc256x/bt_control_cc256x.c b/chipset/cc256x/bt_control_cc256x.c
similarity index 100%
rename from chipsets/cc256x/bt_control_cc256x.c
rename to chipset/cc256x/bt_control_cc256x.c
diff --git a/chipsets/cc256x/bt_control_cc256x.h b/chipset/cc256x/bt_control_cc256x.h
similarity index 100%
rename from chipsets/cc256x/bt_control_cc256x.h
rename to chipset/cc256x/bt_control_cc256x.h
diff --git a/chipsets/cc256x/convert_bts_init_scripts.py b/chipset/cc256x/convert_bts_init_scripts.py
similarity index 100%
rename from chipsets/cc256x/convert_bts_init_scripts.py
rename to chipset/cc256x/convert_bts_init_scripts.py
diff --git a/chipsets/csr/bt_control_csr.c b/chipset/csr/bt_control_csr.c
similarity index 100%
rename from chipsets/csr/bt_control_csr.c
rename to chipset/csr/bt_control_csr.c
diff --git a/chipsets/csr/bt_control_csr.h b/chipset/csr/bt_control_csr.h
similarity index 100%
rename from chipsets/csr/bt_control_csr.h
rename to chipset/csr/bt_control_csr.h
diff --git a/chipsets/em9301/bt_control_em9301.c b/chipset/em9301/bt_control_em9301.c
similarity index 100%
rename from chipsets/em9301/bt_control_em9301.c
rename to chipset/em9301/bt_control_em9301.c
diff --git a/chipsets/em9301/bt_control_em9301.h b/chipset/em9301/bt_control_em9301.h
similarity index 100%
rename from chipsets/em9301/bt_control_em9301.h
rename to chipset/em9301/bt_control_em9301.h
diff --git a/chipsets/stlc2500d/bt_control_stlc2500d.c b/chipset/stlc2500d/bt_control_stlc2500d.c
similarity index 100%
rename from chipsets/stlc2500d/bt_control_stlc2500d.c
rename to chipset/stlc2500d/bt_control_stlc2500d.c
diff --git a/chipsets/stlc2500d/bt_control_stlc2500d.h b/chipset/stlc2500d/bt_control_stlc2500d.h
similarity index 100%
rename from chipsets/stlc2500d/bt_control_stlc2500d.h
rename to chipset/stlc2500d/bt_control_stlc2500d.h