diff --git a/arch/sim/Kconfig b/arch/sim/Kconfig
index d56bfbc1d0..d4bf05d129 100644
--- a/arch/sim/Kconfig
+++ b/arch/sim/Kconfig
@@ -21,6 +21,10 @@ config HOST_ARM
 
 endchoice # Host CPU Type
 
+config ARCH_CHIP
+	string
+	default "sim" if ARCH_SIM
+
 config SIM_M32
 	bool "Build 32-bit simulation on 64-bit machine"
 	default n
diff --git a/arch/sim/include/sim/README.txt b/arch/sim/include/sim/README.txt
new file mode 100644
index 0000000000..fc4429b01c
--- /dev/null
+++ b/arch/sim/include/sim/README.txt
@@ -0,0 +1,3 @@
+This is just a placeholder to assure that this fake "chip" directory exits.
+The simulation, of course, has no chips.
+
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 7b9bf4b877..24fe40c8a6 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -36,9 +36,10 @@
 
 -include $(TOPDIR)/Make.defs
 
-CPPFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
-CFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
-CXXFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
+ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+CPPFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRADEFINES)
+CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRADEFINES)
+CXXFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRADEFINES)
 
 ASRCS =
 
@@ -62,6 +63,8 @@ CSRCS += up_unblocktask.c up_blocktask.c up_releasepending.c
 CSRCS += up_reprioritizertr.c up_exit.c up_schedulesigaction.c up_spiflash.c
 CSRCS += up_allocateheap.c up_devconsole.c up_qspiflash.c
 
+VPATH = sim
+
 HOSTSRCS = up_hostusleep.c
 
 ifeq ($(CONFIG_SCHED_TICKLESS),y)
diff --git a/arch/sim/src/sim/README.txt b/arch/sim/src/sim/README.txt
new file mode 100644
index 0000000000..fc4429b01c
--- /dev/null
+++ b/arch/sim/src/sim/README.txt
@@ -0,0 +1,3 @@
+This is just a placeholder to assure that this fake "chip" directory exits.
+The simulation, of course, has no chips.
+
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/sim/board_lcd.c
similarity index 99%
rename from arch/sim/src/board_lcd.c
rename to arch/sim/src/sim/board_lcd.c
index 0467c77b9f..eed24a2a6b 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/sim/board_lcd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/board_lcd.c
+ * arch/sim/src/sim/board_lcd.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_ajoystick.c b/arch/sim/src/sim/up_ajoystick.c
similarity index 99%
rename from arch/sim/src/up_ajoystick.c
rename to arch/sim/src/sim/up_ajoystick.c
index 6fc82c98a6..017c98ccc8 100644
--- a/arch/sim/src/up_ajoystick.c
+++ b/arch/sim/src/sim/up_ajoystick.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_ajoystick.c
+ * arch/sim/src/sim/up_ajoystick.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_allocateheap.c b/arch/sim/src/sim/up_allocateheap.c
similarity index 98%
rename from arch/sim/src/up_allocateheap.c
rename to arch/sim/src/sim/up_allocateheap.c
index 108e74f4cf..980cda9249 100644
--- a/arch/sim/src/up_allocateheap.c
+++ b/arch/sim/src/sim/up_allocateheap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_allocateheap.c
+ * arch/sim/src/sim/up_allocateheap.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_blockdevice.c b/arch/sim/src/sim/up_blockdevice.c
similarity index 98%
rename from arch/sim/src/up_blockdevice.c
rename to arch/sim/src/sim/up_blockdevice.c
index b74480ecc0..ad3ec6d89a 100644
--- a/arch/sim/src/up_blockdevice.c
+++ b/arch/sim/src/sim/up_blockdevice.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_blockdevice.c
+ * arch/sim/src/sim/up_blockdevice.c
  *
  *   Copyright (C) 2007-2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_blocktask.c b/arch/sim/src/sim/up_blocktask.c
similarity index 99%
rename from arch/sim/src/up_blocktask.c
rename to arch/sim/src/sim/up_blocktask.c
index 8e481007e5..c7deef2c2b 100644
--- a/arch/sim/src/up_blocktask.c
+++ b/arch/sim/src/sim/up_blocktask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_blocktask.c
+ * arch/sim/src/sim/up_blocktask.c
  *
  *   Copyright (C) 2007-2009, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_cpuidlestack.c b/arch/sim/src/sim/up_cpuidlestack.c
similarity index 99%
rename from arch/sim/src/up_cpuidlestack.c
rename to arch/sim/src/sim/up_cpuidlestack.c
index 4a237c1b6b..04aed42f6b 100644
--- a/arch/sim/src/up_cpuidlestack.c
+++ b/arch/sim/src/sim/up_cpuidlestack.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_cpuidlestack.c
+ * arch/sim/src/sim/up_cpuidlestack.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_createstack.c b/arch/sim/src/sim/up_createstack.c
similarity index 99%
rename from arch/sim/src/up_createstack.c
rename to arch/sim/src/sim/up_createstack.c
index 2d511ba6c5..5d979f20c2 100644
--- a/arch/sim/src/up_createstack.c
+++ b/arch/sim/src/sim/up_createstack.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_createstack.c
+ * arch/sim/src/sim/up_createstack.c
  *
  *   Copyright (C) 2007-2009, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_critmon.c b/arch/sim/src/sim/up_critmon.c
similarity index 99%
rename from arch/sim/src/up_critmon.c
rename to arch/sim/src/sim/up_critmon.c
index 10ae1ac244..4937b873a8 100644
--- a/arch/sim/src/up_critmon.c
+++ b/arch/sim/src/sim/up_critmon.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/sim/src/up_critmon.c
+ * arch/sim/src/sim/up_critmon.c
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_devconsole.c b/arch/sim/src/sim/up_devconsole.c
similarity index 99%
rename from arch/sim/src/up_devconsole.c
rename to arch/sim/src/sim/up_devconsole.c
index 6cfee4e3ce..bd12f51a43 100644
--- a/arch/sim/src/up_devconsole.c
+++ b/arch/sim/src/sim/up_devconsole.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_devconsole.c
+ * arch/sim/src/sim/up_devconsole.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_deviceimage.c b/arch/sim/src/sim/up_deviceimage.c
similarity index 99%
rename from arch/sim/src/up_deviceimage.c
rename to arch/sim/src/sim/up_deviceimage.c
index bf3ccc0dc2..579a5d59b4 100644
--- a/arch/sim/src/up_deviceimage.c
+++ b/arch/sim/src/sim/up_deviceimage.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_deviceimage.c
+ * arch/sim/src/sim/up_deviceimage.c
  *
  *   Copyright (C) 2007, 2009, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/sim/up_exit.c
similarity index 99%
rename from arch/sim/src/up_exit.c
rename to arch/sim/src/sim/up_exit.c
index 4ac8d5d35c..e699d18c96 100644
--- a/arch/sim/src/up_exit.c
+++ b/arch/sim/src/sim/up_exit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_exit.c
+ * arch/sim/src/sim/up_exit.c
  *
  *   Copyright (C) 2007-2009, 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/sim/up_framebuffer.c
similarity index 99%
rename from arch/sim/src/up_framebuffer.c
rename to arch/sim/src/sim/up_framebuffer.c
index 8178c3994d..3db66dd46c 100644
--- a/arch/sim/src/up_framebuffer.c
+++ b/arch/sim/src/sim/up_framebuffer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_framebuffer.c
+ * arch/sim/src/sim/up_framebuffer.c
  *
  *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_head.c b/arch/sim/src/sim/up_head.c
similarity index 99%
rename from arch/sim/src/up_head.c
rename to arch/sim/src/sim/up_head.c
index c163c1871d..8d9d0acc7b 100644
--- a/arch/sim/src/up_head.c
+++ b/arch/sim/src/sim/up_head.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_head.c
+ * arch/sim/src/sim/up_head.c
  *
  *   Copyright (C) 2007-2009, 2011-2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_hostfs.c b/arch/sim/src/sim/up_hostfs.c
similarity index 99%
rename from arch/sim/src/up_hostfs.c
rename to arch/sim/src/sim/up_hostfs.c
index b906738084..2ecdd6536d 100644
--- a/arch/sim/src/up_hostfs.c
+++ b/arch/sim/src/sim/up_hostfs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_hostfs.c
+ * arch/sim/src/sim/up_hostfs.c
  *
  *   Copyright (C) 2015 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pettitkd@gmail.com>
diff --git a/arch/sim/src/up_hostusleep.c b/arch/sim/src/sim/up_hostusleep.c
similarity index 98%
rename from arch/sim/src/up_hostusleep.c
rename to arch/sim/src/sim/up_hostusleep.c
index 8fb09c8373..a36e83ea67 100644
--- a/arch/sim/src/up_hostusleep.c
+++ b/arch/sim/src/sim/up_hostusleep.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_hostusleep.c
+ * arch/sim/src/sim/up_hostusleep.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_idle.c b/arch/sim/src/sim/up_idle.c
similarity index 99%
rename from arch/sim/src/up_idle.c
rename to arch/sim/src/sim/up_idle.c
index c0b8cf4ee6..f57f0e1700 100644
--- a/arch/sim/src/up_idle.c
+++ b/arch/sim/src/sim/up_idle.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_idle.c
+ * arch/sim/src/sim/up_idle.c
  *
  *   Copyright (C) 2007-2009, 2011-2012, 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/sim/up_initialize.c
similarity index 99%
rename from arch/sim/src/up_initialize.c
rename to arch/sim/src/sim/up_initialize.c
index 2621e43e7a..225313fb64 100644
--- a/arch/sim/src/up_initialize.c
+++ b/arch/sim/src/sim/up_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_initialize.c
+ * arch/sim/src/sim/up_initialize.c
  *
  *   Copyright (C) 2007-2009, 2011-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_initialstate.c b/arch/sim/src/sim/up_initialstate.c
similarity index 98%
rename from arch/sim/src/up_initialstate.c
rename to arch/sim/src/sim/up_initialstate.c
index e279e3c476..3ddb1128d7 100644
--- a/arch/sim/src/up_initialstate.c
+++ b/arch/sim/src/sim/up_initialstate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_initialstate.c
+ * arch/sim/src/sim/up_initialstate.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_interruptcontext.c b/arch/sim/src/sim/up_interruptcontext.c
similarity index 98%
rename from arch/sim/src/up_interruptcontext.c
rename to arch/sim/src/sim/up_interruptcontext.c
index 446807b1dc..639816cfd5 100644
--- a/arch/sim/src/up_interruptcontext.c
+++ b/arch/sim/src/sim/up_interruptcontext.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_interruptcontext.c
+ * arch/sim/src/sim/up_interruptcontext.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_ioexpander.c b/arch/sim/src/sim/up_ioexpander.c
similarity index 99%
rename from arch/sim/src/up_ioexpander.c
rename to arch/sim/src/sim/up_ioexpander.c
index 584a2e97f6..4339bf21b1 100644
--- a/arch/sim/src/up_ioexpander.c
+++ b/arch/sim/src/sim/up_ioexpander.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_ioexpander.h
+ * arch/sim/src/sim/up_ioexpander.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_netdev.c b/arch/sim/src/sim/up_netdev.c
similarity index 98%
rename from arch/sim/src/up_netdev.c
rename to arch/sim/src/sim/up_netdev.c
index 8346652180..ae868d2449 100644
--- a/arch/sim/src/up_netdev.c
+++ b/arch/sim/src/sim/up_netdev.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_tapdev.c
+ * arch/sim/src/sim/up_tapdev.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/sim/up_netdriver.c
similarity index 99%
rename from arch/sim/src/up_netdriver.c
rename to arch/sim/src/sim/up_netdriver.c
index 3c45444726..c820dc9b38 100644
--- a/arch/sim/src/up_netdriver.c
+++ b/arch/sim/src/sim/up_netdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_netdriver.c
+ * arch/sim/src/sim/up_netdriver.c
  *
  *   Copyright (C) 2007, 2009-2012, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_oneshot.c b/arch/sim/src/sim/up_oneshot.c
similarity index 99%
rename from arch/sim/src/up_oneshot.c
rename to arch/sim/src/sim/up_oneshot.c
index 2d36f821f7..61c1366847 100644
--- a/arch/sim/src/up_oneshot.c
+++ b/arch/sim/src/sim/up_oneshot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- *  arch/sim/src/up_oneshot.c
+ *  arch/sim/src/sim/up_oneshot.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_qspiflash.c b/arch/sim/src/sim/up_qspiflash.c
similarity index 99%
rename from arch/sim/src/up_qspiflash.c
rename to arch/sim/src/sim/up_qspiflash.c
index f01002d7fe..d887ced396 100644
--- a/arch/sim/src/up_qspiflash.c
+++ b/arch/sim/src/sim/up_qspiflash.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/sim/src/up_qspiflash.c
+ * arch/sim/src/sim/up_qspiflash.c
  *
  *   Copyright (C) 2014, 2016 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pettitkd@gmail.com>
diff --git a/arch/sim/src/up_releasepending.c b/arch/sim/src/sim/up_releasepending.c
similarity index 99%
rename from arch/sim/src/up_releasepending.c
rename to arch/sim/src/sim/up_releasepending.c
index 7a1df74827..33555a1886 100644
--- a/arch/sim/src/up_releasepending.c
+++ b/arch/sim/src/sim/up_releasepending.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_releasepending.c
+ * arch/sim/src/sim/up_releasepending.c
  *
  *   Copyright (C) 2007-2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_releasestack.c b/arch/sim/src/sim/up_releasestack.c
similarity index 98%
rename from arch/sim/src/up_releasestack.c
rename to arch/sim/src/sim/up_releasestack.c
index 98d54171f2..4c3cd00422 100644
--- a/arch/sim/src/up_releasestack.c
+++ b/arch/sim/src/sim/up_releasestack.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_releasestack.c
+ * arch/sim/src/sim/up_releasestack.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/sim/up_reprioritizertr.c
similarity index 99%
rename from arch/sim/src/up_reprioritizertr.c
rename to arch/sim/src/sim/up_reprioritizertr.c
index a0edf12db0..251b94155a 100644
--- a/arch/sim/src/up_reprioritizertr.c
+++ b/arch/sim/src/sim/up_reprioritizertr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_reprioritizertr.c
+ * arch/sim/src/sim/up_reprioritizertr.c
  *
  *   Copyright (C) 2007-2009, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_romgetc.c b/arch/sim/src/sim/up_romgetc.c
similarity index 99%
rename from arch/sim/src/up_romgetc.c
rename to arch/sim/src/sim/up_romgetc.c
index e5f6c6c90e..955674d894 100644
--- a/arch/sim/src/up_romgetc.c
+++ b/arch/sim/src/sim/up_romgetc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_romgetc.c
+ * arch/sim/src/sim/up_romgetc.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_schednote.c b/arch/sim/src/sim/up_schednote.c
similarity index 99%
rename from arch/sim/src/up_schednote.c
rename to arch/sim/src/sim/up_schednote.c
index 28e2fd8fbf..ece96e988c 100644
--- a/arch/sim/src/up_schednote.c
+++ b/arch/sim/src/sim/up_schednote.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_schednote.c
+ * arch/sim/src/sim/up_schednote.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_schedulesigaction.c b/arch/sim/src/sim/up_schedulesigaction.c
similarity index 98%
rename from arch/sim/src/up_schedulesigaction.c
rename to arch/sim/src/sim/up_schedulesigaction.c
index 229bfa6746..b875b91f46 100644
--- a/arch/sim/src/up_schedulesigaction.c
+++ b/arch/sim/src/sim/up_schedulesigaction.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_schedulesigaction.c
+ * arch/sim/src/sim/up_schedulesigaction.c
  *
  *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_setjmp32.S b/arch/sim/src/sim/up_setjmp32.S
similarity index 99%
rename from arch/sim/src/up_setjmp32.S
rename to arch/sim/src/sim/up_setjmp32.S
index e223afbeab..15880cbf73 100644
--- a/arch/sim/src/up_setjmp32.S
+++ b/arch/sim/src/sim/up_setjmp32.S
@@ -1,5 +1,5 @@
 /**************************************************************************
- * arch/sim/src/up_setjmp32.S
+ * arch/sim/src/sim/up_setjmp32.S
  *
  *   Copyright (C) 2007, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_setjmp64.S b/arch/sim/src/sim/up_setjmp64.S
similarity index 99%
rename from arch/sim/src/up_setjmp64.S
rename to arch/sim/src/sim/up_setjmp64.S
index 4045494b31..92cc866523 100644
--- a/arch/sim/src/up_setjmp64.S
+++ b/arch/sim/src/sim/up_setjmp64.S
@@ -1,5 +1,5 @@
 /**************************************************************************
- * arch/sim/src/up_setjmp64.S
+ * arch/sim/src/sim/up_setjmp64.S
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_setjmp_arm.S b/arch/sim/src/sim/up_setjmp_arm.S
similarity index 98%
rename from arch/sim/src/up_setjmp_arm.S
rename to arch/sim/src/sim/up_setjmp_arm.S
index 444458c25f..180d9b74c0 100644
--- a/arch/sim/src/up_setjmp_arm.S
+++ b/arch/sim/src/sim/up_setjmp_arm.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_setjmp_arm.h
+ * arch/sim/src/sim/up_setjmp_arm.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Nickolay Semyonov (RPI) <snob@wolpike.com>
diff --git a/arch/sim/src/up_simsmp.c b/arch/sim/src/sim/up_simsmp.c
similarity index 99%
rename from arch/sim/src/up_simsmp.c
rename to arch/sim/src/sim/up_simsmp.c
index 3a8e688974..024394b277 100644
--- a/arch/sim/src/up_simsmp.c
+++ b/arch/sim/src/sim/up_simsmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_simsmp.c
+ * arch/sim/src/sim/up_simsmp.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_simuart.c b/arch/sim/src/sim/up_simuart.c
similarity index 99%
rename from arch/sim/src/up_simuart.c
rename to arch/sim/src/sim/up_simuart.c
index a532839f85..9e28179a10 100644
--- a/arch/sim/src/up_simuart.c
+++ b/arch/sim/src/sim/up_simuart.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_simuart.c
+ * arch/sim/src/sim/up_simuart.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_smphook.c b/arch/sim/src/sim/up_smphook.c
similarity index 98%
rename from arch/sim/src/up_smphook.c
rename to arch/sim/src/sim/up_smphook.c
index 2b979aefcc..e94625c644 100644
--- a/arch/sim/src/up_smphook.c
+++ b/arch/sim/src/sim/up_smphook.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_simhook.c
+ * arch/sim/src/sim/up_simhook.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_smpsignal.c b/arch/sim/src/sim/up_smpsignal.c
similarity index 99%
rename from arch/sim/src/up_smpsignal.c
rename to arch/sim/src/sim/up_smpsignal.c
index 5b5c761a07..da1d8bbd3d 100644
--- a/arch/sim/src/up_smpsignal.c
+++ b/arch/sim/src/sim/up_smpsignal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_simsmp.c
+ * arch/sim/src/sim/up_simsmp.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/sim/up_spiflash.c
similarity index 99%
rename from arch/sim/src/up_spiflash.c
rename to arch/sim/src/sim/up_spiflash.c
index a75cb82948..d81822d0ae 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/sim/up_spiflash.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/sim/src/up_spiflash.c
+ * arch/sim/src/sim/up_spiflash.c
  *
  *   Copyright (C) 2014, 2016 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pettitkd@gmail.com>
diff --git a/arch/sim/src/up_stackframe.c b/arch/sim/src/sim/up_stackframe.c
similarity index 99%
rename from arch/sim/src/up_stackframe.c
rename to arch/sim/src/sim/up_stackframe.c
index 624520dc20..eecb3668af 100644
--- a/arch/sim/src/up_stackframe.c
+++ b/arch/sim/src/sim/up_stackframe.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_stackframe.c
+ * arch/sim/src/sim/up_stackframe.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_tapdev.c b/arch/sim/src/sim/up_tapdev.c
similarity index 99%
rename from arch/sim/src/up_tapdev.c
rename to arch/sim/src/sim/up_tapdev.c
index ce18dee054..fc38d4c83e 100644
--- a/arch/sim/src/up_tapdev.c
+++ b/arch/sim/src/sim/up_tapdev.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_tapdev.c
+ * arch/sim/src/sim/up_tapdev.c
  *
  *   Copyright (C) 2007-2009, 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_testset.c b/arch/sim/src/sim/up_testset.c
similarity index 99%
rename from arch/sim/src/up_testset.c
rename to arch/sim/src/sim/up_testset.c
index 1f825e6415..9f3278c51c 100644
--- a/arch/sim/src/up_testset.c
+++ b/arch/sim/src/sim/up_testset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_testset.c
+ * arch/sim/src/sim/up_testset.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_tickless.c b/arch/sim/src/sim/up_tickless.c
similarity index 99%
rename from arch/sim/src/up_tickless.c
rename to arch/sim/src/sim/up_tickless.c
index 45e6874a77..bf7f1f7614 100644
--- a/arch/sim/src/up_tickless.c
+++ b/arch/sim/src/sim/up_tickless.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_tickless.c
+ * arch/sim/src/sim/up_tickless.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/sim/up_touchscreen.c
similarity index 99%
rename from arch/sim/src/up_touchscreen.c
rename to arch/sim/src/sim/up_touchscreen.c
index 3b1cf7c2cb..adcce13899 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/sim/up_touchscreen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_touchscreen.c
+ * arch/sim/src/sim/up_touchscreen.c
  *
  *   Copyright (C) 2011-2012, 2016-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_uartwait.c b/arch/sim/src/sim/up_uartwait.c
similarity index 99%
rename from arch/sim/src/up_uartwait.c
rename to arch/sim/src/sim/up_uartwait.c
index cf1e31cf72..3052b41b70 100644
--- a/arch/sim/src/up_uartwait.c
+++ b/arch/sim/src/sim/up_uartwait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_uartwait.c
+ * arch/sim/src/sim/up_uartwait.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_unblocktask.c b/arch/sim/src/sim/up_unblocktask.c
similarity index 99%
rename from arch/sim/src/up_unblocktask.c
rename to arch/sim/src/sim/up_unblocktask.c
index 5b47603d40..2bfd2cbcd0 100644
--- a/arch/sim/src/up_unblocktask.c
+++ b/arch/sim/src/sim/up_unblocktask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_unblocktask.c
+ * arch/sim/src/sim/up_unblocktask.c
  *
  *   Copyright (C) 2007-2009, 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_usestack.c b/arch/sim/src/sim/up_usestack.c
similarity index 99%
rename from arch/sim/src/up_usestack.c
rename to arch/sim/src/sim/up_usestack.c
index f31ed5aae3..9b293f36e3 100644
--- a/arch/sim/src/up_usestack.c
+++ b/arch/sim/src/sim/up_usestack.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_usestack.c
+ * arch/sim/src/sim/up_usestack.c
  *
  *   Copyright (C) 2007-2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_wpcap.c b/arch/sim/src/sim/up_wpcap.c
similarity index 99%
rename from arch/sim/src/up_wpcap.c
rename to arch/sim/src/sim/up_wpcap.c
index 69c808c532..4b12c2bf2d 100644
--- a/arch/sim/src/up_wpcap.c
+++ b/arch/sim/src/sim/up_wpcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_wcap.c
+ * arch/sim/src/sim/up_wcap.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_x11eventloop.c b/arch/sim/src/sim/up_x11eventloop.c
similarity index 99%
rename from arch/sim/src/up_x11eventloop.c
rename to arch/sim/src/sim/up_x11eventloop.c
index 35199ff2ef..fea5b1026a 100644
--- a/arch/sim/src/up_x11eventloop.c
+++ b/arch/sim/src/sim/up_x11eventloop.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_x11eventloop.c
+ * arch/sim/src/sim/up_x11eventloop.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/sim/src/up_x11framebuffer.c b/arch/sim/src/sim/up_x11framebuffer.c
similarity index 99%
rename from arch/sim/src/up_x11framebuffer.c
rename to arch/sim/src/sim/up_x11framebuffer.c
index 78487409bc..46aefd3ee7 100644
--- a/arch/sim/src/up_x11framebuffer.c
+++ b/arch/sim/src/sim/up_x11framebuffer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sim/src/up_x11framebuffer.c
+ * arch/sim/src/sim/up_x11framebuffer.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/tools/configure.sh b/tools/configure.sh
index 16bf458e32..422ab7a857 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -152,7 +152,6 @@ for chip in ${chips}; do
     chipdir=${chip}
     echo "  Detected ${archdir} Architecture"
     echo "  Detected ${chipdir} Chip"
-    echo ""
   fi
 done
 done