diff --git a/extra_include/xtensa/cacheasm.h b/components/esp8266/include/xtensa/cacheasm.h
similarity index 100%
rename from extra_include/xtensa/cacheasm.h
rename to components/esp8266/include/xtensa/cacheasm.h
diff --git a/extra_include/xtensa/cacheattrasm.h b/components/esp8266/include/xtensa/cacheattrasm.h
similarity index 100%
rename from extra_include/xtensa/cacheattrasm.h
rename to components/esp8266/include/xtensa/cacheattrasm.h
diff --git a/extra_include/xtensa/config/core-isa.h b/components/esp8266/include/xtensa/config/core-isa.h
similarity index 100%
rename from extra_include/xtensa/config/core-isa.h
rename to components/esp8266/include/xtensa/config/core-isa.h
diff --git a/extra_include/xtensa/config/core-matmap.h b/components/esp8266/include/xtensa/config/core-matmap.h
similarity index 100%
rename from extra_include/xtensa/config/core-matmap.h
rename to components/esp8266/include/xtensa/config/core-matmap.h
diff --git a/extra_include/xtensa/config/core.h b/components/esp8266/include/xtensa/config/core.h
similarity index 100%
rename from extra_include/xtensa/config/core.h
rename to components/esp8266/include/xtensa/config/core.h
diff --git a/extra_include/xtensa/config/defs.h b/components/esp8266/include/xtensa/config/defs.h
similarity index 100%
rename from extra_include/xtensa/config/defs.h
rename to components/esp8266/include/xtensa/config/defs.h
diff --git a/extra_include/xtensa/config/specreg.h b/components/esp8266/include/xtensa/config/specreg.h
similarity index 100%
rename from extra_include/xtensa/config/specreg.h
rename to components/esp8266/include/xtensa/config/specreg.h
diff --git a/extra_include/xtensa/config/system.h b/components/esp8266/include/xtensa/config/system.h
similarity index 100%
rename from extra_include/xtensa/config/system.h
rename to components/esp8266/include/xtensa/config/system.h
diff --git a/extra_include/xtensa/config/tie-asm.h b/components/esp8266/include/xtensa/config/tie-asm.h
similarity index 100%
rename from extra_include/xtensa/config/tie-asm.h
rename to components/esp8266/include/xtensa/config/tie-asm.h
diff --git a/extra_include/xtensa/config/tie.h b/components/esp8266/include/xtensa/config/tie.h
similarity index 100%
rename from extra_include/xtensa/config/tie.h
rename to components/esp8266/include/xtensa/config/tie.h
diff --git a/extra_include/xtensa/coreasm.h b/components/esp8266/include/xtensa/coreasm.h
similarity index 100%
rename from extra_include/xtensa/coreasm.h
rename to components/esp8266/include/xtensa/coreasm.h
diff --git a/extra_include/xtensa/corebits.h b/components/esp8266/include/xtensa/corebits.h
similarity index 100%
rename from extra_include/xtensa/corebits.h
rename to components/esp8266/include/xtensa/corebits.h
diff --git a/extra_include/xtensa/hal.h b/components/esp8266/include/xtensa/hal.h
similarity index 100%
rename from extra_include/xtensa/hal.h
rename to components/esp8266/include/xtensa/hal.h
diff --git a/extra_include/xtensa/sim.h b/components/esp8266/include/xtensa/sim.h
similarity index 100%
rename from extra_include/xtensa/sim.h
rename to components/esp8266/include/xtensa/sim.h
diff --git a/extra_include/xtensa/simcall-errno.h b/components/esp8266/include/xtensa/simcall-errno.h
similarity index 100%
rename from extra_include/xtensa/simcall-errno.h
rename to components/esp8266/include/xtensa/simcall-errno.h
diff --git a/extra_include/xtensa/simcall-fcntl.h b/components/esp8266/include/xtensa/simcall-fcntl.h
similarity index 100%
rename from extra_include/xtensa/simcall-fcntl.h
rename to components/esp8266/include/xtensa/simcall-fcntl.h
diff --git a/extra_include/xtensa/simcall.h b/components/esp8266/include/xtensa/simcall.h
similarity index 100%
rename from extra_include/xtensa/simcall.h
rename to components/esp8266/include/xtensa/simcall.h
diff --git a/extra_include/xtensa/specreg.h b/components/esp8266/include/xtensa/specreg.h
similarity index 100%
rename from extra_include/xtensa/specreg.h
rename to components/esp8266/include/xtensa/specreg.h
diff --git a/extra_include/xtensa/tie/xt_MUL32.h b/components/esp8266/include/xtensa/tie/xt_MUL32.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_MUL32.h
rename to components/esp8266/include/xtensa/tie/xt_MUL32.h
diff --git a/extra_include/xtensa/tie/xt_core.h b/components/esp8266/include/xtensa/tie/xt_core.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_core.h
rename to components/esp8266/include/xtensa/tie/xt_core.h
diff --git a/extra_include/xtensa/tie/xt_debug.h b/components/esp8266/include/xtensa/tie/xt_debug.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_debug.h
rename to components/esp8266/include/xtensa/tie/xt_debug.h
diff --git a/extra_include/xtensa/tie/xt_density.h b/components/esp8266/include/xtensa/tie/xt_density.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_density.h
rename to components/esp8266/include/xtensa/tie/xt_density.h
diff --git a/extra_include/xtensa/tie/xt_exceptions.h b/components/esp8266/include/xtensa/tie/xt_exceptions.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_exceptions.h
rename to components/esp8266/include/xtensa/tie/xt_exceptions.h
diff --git a/extra_include/xtensa/tie/xt_externalregisters.h b/components/esp8266/include/xtensa/tie/xt_externalregisters.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_externalregisters.h
rename to components/esp8266/include/xtensa/tie/xt_externalregisters.h
diff --git a/extra_include/xtensa/tie/xt_interrupt.h b/components/esp8266/include/xtensa/tie/xt_interrupt.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_interrupt.h
rename to components/esp8266/include/xtensa/tie/xt_interrupt.h
diff --git a/extra_include/xtensa/tie/xt_misc.h b/components/esp8266/include/xtensa/tie/xt_misc.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_misc.h
rename to components/esp8266/include/xtensa/tie/xt_misc.h
diff --git a/extra_include/xtensa/tie/xt_mmu.h b/components/esp8266/include/xtensa/tie/xt_mmu.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_mmu.h
rename to components/esp8266/include/xtensa/tie/xt_mmu.h
diff --git a/extra_include/xtensa/tie/xt_mul.h b/components/esp8266/include/xtensa/tie/xt_mul.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_mul.h
rename to components/esp8266/include/xtensa/tie/xt_mul.h
diff --git a/extra_include/xtensa/tie/xt_timer.h b/components/esp8266/include/xtensa/tie/xt_timer.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_timer.h
rename to components/esp8266/include/xtensa/tie/xt_timer.h
diff --git a/extra_include/xtensa/tie/xt_trace.h b/components/esp8266/include/xtensa/tie/xt_trace.h
similarity index 100%
rename from extra_include/xtensa/tie/xt_trace.h
rename to components/esp8266/include/xtensa/tie/xt_trace.h
diff --git a/extra_include/xtensa/xtensa-libdb-macros.h b/components/esp8266/include/xtensa/xtensa-libdb-macros.h
similarity index 100%
rename from extra_include/xtensa/xtensa-libdb-macros.h
rename to components/esp8266/include/xtensa/xtensa-libdb-macros.h
diff --git a/extra_include/xtensa/xtensa-xer.h b/components/esp8266/include/xtensa/xtensa-xer.h
similarity index 100%
rename from extra_include/xtensa/xtensa-xer.h
rename to components/esp8266/include/xtensa/xtensa-xer.h
diff --git a/extra_include/xtensa/xtruntime-frames.h b/components/esp8266/include/xtensa/xtruntime-frames.h
similarity index 100%
rename from extra_include/xtensa/xtruntime-frames.h
rename to components/esp8266/include/xtensa/xtruntime-frames.h
diff --git a/extra_include/xtensa/xtruntime.h b/components/esp8266/include/xtensa/xtruntime.h
similarity index 100%
rename from extra_include/xtensa/xtruntime.h
rename to components/esp8266/include/xtensa/xtruntime.h