diff --git a/ieee802154/Kconfig b/wireless/ieee802154/Kconfig
similarity index 51%
rename from ieee802154/Kconfig
rename to wireless/ieee802154/Kconfig
index 0121396b5..13b63f337 100644
--- a/ieee802154/Kconfig
+++ b/wireless/ieee802154/Kconfig
@@ -5,8 +5,8 @@
 
 menu "IEEE 802.15.4 applications"
 
-source "$APPSDIR/ieee802154/common/Kconfig"
-source "$APPSDIR/ieee802154/coord/Kconfig"
-source "$APPSDIR/ieee802154/i8sak/Kconfig"
+source "$APPSDIR/wireless/ieee802154/common/Kconfig"
+source "$APPSDIR/wireless/ieee802154/coord/Kconfig"
+source "$APPSDIR/wireless/ieee802154/i8sak/Kconfig"
 
 endmenu #ieee 802.15.4 apps
diff --git a/ieee802154/Make.defs b/wireless/ieee802154/Make.defs
similarity index 95%
rename from ieee802154/Make.defs
rename to wireless/ieee802154/Make.defs
index 30e651189..ecb59032c 100644
--- a/ieee802154/Make.defs
+++ b/wireless/ieee802154/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ieee802154/Make.defs
+# apps/wireless/ieee802154/Make.defs
 # Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard ieee802154/*/Make.defs)
+include $(wildcard wireless/ieee802154/*/Make.defs)
diff --git a/ieee802154/Makefile b/wireless/ieee802154/Makefile
similarity index 98%
rename from ieee802154/Makefile
rename to wireless/ieee802154/Makefile
index 55daf61c1..d9b70ee44 100644
--- a/ieee802154/Makefile
+++ b/wireless/ieee802154/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ieee802154/Makefile
+# apps/wireless/ieee802154/Makefile
 #
 #   Copyright (C) 2014 Gregory Nutt. All rights reserved.
 #   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/wireless/ieee802154/common/.gitignore b/wireless/ieee802154/common/.gitignore
new file mode 100644
index 000000000..fa1ec7579
--- /dev/null
+++ b/wireless/ieee802154/common/.gitignore
@@ -0,0 +1,11 @@
+/Make.dep
+/.depend
+/.built
+/*.asm
+/*.obj
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
diff --git a/ieee802154/common/Kconfig b/wireless/ieee802154/common/Kconfig
similarity index 100%
rename from ieee802154/common/Kconfig
rename to wireless/ieee802154/common/Kconfig
diff --git a/ieee802154/common/Make.defs b/wireless/ieee802154/common/Make.defs
similarity index 95%
rename from ieee802154/common/Make.defs
rename to wireless/ieee802154/common/Make.defs
index 421300973..89c2b702b 100644
--- a/ieee802154/common/Make.defs
+++ b/wireless/ieee802154/common/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/nshlib/Make.defs
+# apps/wireless/ieee802154/Make.defs
 # Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
@@ -35,6 +35,6 @@
 ############################################################################
 
 ifeq ($(CONFIG_IEEE802154_COMMON),y)
-CONFIGURED_APPS += ieee802154/common
+CONFIGURED_APPS += wireless/ieee802154/common
 endif
 
diff --git a/ieee802154/common/Makefile b/wireless/ieee802154/common/Makefile
similarity index 95%
rename from ieee802154/common/Makefile
rename to wireless/ieee802154/common/Makefile
index e2f441c2c..d5ce28b98 100644
--- a/ieee802154/common/Makefile
+++ b/wireless/ieee802154/common/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/nshlib/Makefile
+# apps/wireless/ieee802154/Makefile
 #
 #   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,12 +56,12 @@ SRCS = $(ASRCS) $(CSRCS)
 OBJS = $(AOBJS) $(COBJS)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN		= ..\..\libapps$(LIBEXT)
+  BIN		= ..\..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN		= ..\\..\\libapps$(LIBEXT)
+  BIN		= ..\\..\\..\\libapps$(LIBEXT)
 else
-  BIN		= ../../libapps$(LIBEXT)
+  BIN		= ../../../libapps$(LIBEXT)
 endif
 endif
 
diff --git a/ieee802154/common/ieee802154_addrparse.c b/wireless/ieee802154/common/ieee802154_addrparse.c
similarity index 98%
rename from ieee802154/common/ieee802154_addrparse.c
rename to wireless/ieee802154/common/ieee802154_addrparse.c
index cfd50e80b..dd36d529a 100644
--- a/ieee802154/common/ieee802154_addrparse.c
+++ b/wireless/ieee802154/common/ieee802154_addrparse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_addrparse.c
+ * apps/wireless/ieee802154/common/ieee802154_addrparse.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_addrstore.c b/wireless/ieee802154/common/ieee802154_addrstore.c
similarity index 98%
rename from ieee802154/common/ieee802154_addrstore.c
rename to wireless/ieee802154/common/ieee802154_addrstore.c
index 671f039c0..abefb9a35 100644
--- a/ieee802154/common/ieee802154_addrstore.c
+++ b/wireless/ieee802154/common/ieee802154_addrstore.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_addrparse.c
+ * apps/wireless/ieee802154/common/ieee802154_addrparse.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_addrtostr.c b/wireless/ieee802154/common/ieee802154_addrtostr.c
similarity index 98%
rename from ieee802154/common/ieee802154_addrtostr.c
rename to wireless/ieee802154/common/ieee802154_addrtostr.c
index bd2e8c998..f2f291d2b 100644
--- a/ieee802154/common/ieee802154_addrtostr.c
+++ b/wireless/ieee802154/common/ieee802154_addrtostr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_addrtostr.c
+ * apps/wireless/ieee802154/common/ieee802154_addrtostr.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_getcca.c b/wireless/ieee802154/common/ieee802154_getcca.c
similarity index 97%
rename from ieee802154/common/ieee802154_getcca.c
rename to wireless/ieee802154/common/ieee802154_getcca.c
index a006c3d64..bd8bf15e1 100644
--- a/ieee802154/common/ieee802154_getcca.c
+++ b/wireless/ieee802154/common/ieee802154_getcca.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_getcca.c
+ * apps/wireless/ieee802154/common/ieee802154_getcca.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_getchan.c b/wireless/ieee802154/common/ieee802154_getchan.c
similarity index 97%
rename from ieee802154/common/ieee802154_getchan.c
rename to wireless/ieee802154/common/ieee802154_getchan.c
index c829ceeb1..389a899d4 100644
--- a/ieee802154/common/ieee802154_getchan.c
+++ b/wireless/ieee802154/common/ieee802154_getchan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_getchan.c
+ * apps/wireless/ieee802154/common/ieee802154_getchan.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_setcca.c b/wireless/ieee802154/common/ieee802154_setcca.c
similarity index 97%
rename from ieee802154/common/ieee802154_setcca.c
rename to wireless/ieee802154/common/ieee802154_setcca.c
index 50457ac3b..5f257341a 100644
--- a/ieee802154/common/ieee802154_setcca.c
+++ b/wireless/ieee802154/common/ieee802154_setcca.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_setchan.c
+ * apps/wireless/ieee802154/common/ieee802154_setchan.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_setchan.c b/wireless/ieee802154/common/ieee802154_setchan.c
similarity index 97%
rename from ieee802154/common/ieee802154_setchan.c
rename to wireless/ieee802154/common/ieee802154_setchan.c
index a0f1af67d..df371f6cc 100644
--- a/ieee802154/common/ieee802154_setchan.c
+++ b/wireless/ieee802154/common/ieee802154_setchan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_setchan.c
+ * apps/wireless/ieee802154/common/ieee802154_setchan.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_setdevmode.c b/wireless/ieee802154/common/ieee802154_setdevmode.c
similarity index 97%
rename from ieee802154/common/ieee802154_setdevmode.c
rename to wireless/ieee802154/common/ieee802154_setdevmode.c
index 8427c1bfd..318fd80d9 100644
--- a/ieee802154/common/ieee802154_setdevmode.c
+++ b/wireless/ieee802154/common/ieee802154_setdevmode.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_setdevmode.c
+ * apps/wireless/ieee802154/common/ieee802154_setdevmode.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_seteaddr.c b/wireless/ieee802154/common/ieee802154_seteaddr.c
similarity index 97%
rename from ieee802154/common/ieee802154_seteaddr.c
rename to wireless/ieee802154/common/ieee802154_seteaddr.c
index 185fa16b3..f4e3024a7 100644
--- a/ieee802154/common/ieee802154_seteaddr.c
+++ b/wireless/ieee802154/common/ieee802154_seteaddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_eaddr.c
+ * apps/wireless/ieee802154/common/ieee802154_eaddr.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_setpanid.c b/wireless/ieee802154/common/ieee802154_setpanid.c
similarity index 97%
rename from ieee802154/common/ieee802154_setpanid.c
rename to wireless/ieee802154/common/ieee802154_setpanid.c
index adc89a55a..20a0c3932 100644
--- a/ieee802154/common/ieee802154_setpanid.c
+++ b/wireless/ieee802154/common/ieee802154_setpanid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_setpanid.c
+ * apps/wireless/ieee802154/common/ieee802154_setpanid.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_setpromisc.c b/wireless/ieee802154/common/ieee802154_setpromisc.c
similarity index 97%
rename from ieee802154/common/ieee802154_setpromisc.c
rename to wireless/ieee802154/common/ieee802154_setpromisc.c
index 6b500088c..00d0854ba 100644
--- a/ieee802154/common/ieee802154_setpromisc.c
+++ b/wireless/ieee802154/common/ieee802154_setpromisc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_setpromisc.c
+ * apps/wireless/ieee802154/common/ieee802154_setpromisc.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/ieee802154/common/ieee802154_setsaddr.c b/wireless/ieee802154/common/ieee802154_setsaddr.c
similarity index 97%
rename from ieee802154/common/ieee802154_setsaddr.c
rename to wireless/ieee802154/common/ieee802154_setsaddr.c
index 2651e8110..d68e8455d 100644
--- a/ieee802154/common/ieee802154_setsaddr.c
+++ b/wireless/ieee802154/common/ieee802154_setsaddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/common/ieee802154_setsaddr.c
+ * apps/wireless/ieee802154/common/ieee802154_setsaddr.c
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
diff --git a/wireless/ieee802154/coord/.gitignore b/wireless/ieee802154/coord/.gitignore
new file mode 100644
index 000000000..fa1ec7579
--- /dev/null
+++ b/wireless/ieee802154/coord/.gitignore
@@ -0,0 +1,11 @@
+/Make.dep
+/.depend
+/.built
+/*.asm
+/*.obj
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
diff --git a/ieee802154/coord/Kconfig b/wireless/ieee802154/coord/Kconfig
similarity index 100%
rename from ieee802154/coord/Kconfig
rename to wireless/ieee802154/coord/Kconfig
diff --git a/ieee802154/coord/Make.defs b/wireless/ieee802154/coord/Make.defs
similarity index 95%
rename from ieee802154/coord/Make.defs
rename to wireless/ieee802154/coord/Make.defs
index 6df3e7b4a..3d4974541 100644
--- a/ieee802154/coord/Make.defs
+++ b/wireless/ieee802154/coord/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ieee802154/coord/Make.defs
+# apps/wireless/ieee802154/coord/Make.defs
 # Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -35,5 +35,5 @@
 ############################################################################
 
 ifeq ($(CONFIG_IEEE802154_COORD),y)
-CONFIGURED_APPS += ieee802154/coord
+CONFIGURED_APPS += wireless/ieee802154/coord
 endif
diff --git a/ieee802154/coord/Makefile b/wireless/ieee802154/coord/Makefile
similarity index 96%
rename from ieee802154/coord/Makefile
rename to wireless/ieee802154/coord/Makefile
index 5dc604f78..e4e16124a 100644
--- a/ieee802154/coord/Makefile
+++ b/wireless/ieee802154/coord/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ieee802154/coord/Makefile
+# apps/wireless/ieee802154/coord/Makefile
 #
 #   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
 #   Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved.
@@ -62,12 +62,12 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
 endif
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN = ..\..\libapps$(LIBEXT)
+  BIN = ..\..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN = ..\\..\\libapps$(LIBEXT)
+  BIN = ..\\..\\..\\libapps$(LIBEXT)
 else
-  BIN = ../../libapps$(LIBEXT)
+  BIN = ../../../libapps$(LIBEXT)
 endif
 endif
 
diff --git a/ieee802154/coord/coord_main.c b/wireless/ieee802154/coord/coord_main.c
similarity index 99%
rename from ieee802154/coord/coord_main.c
rename to wireless/ieee802154/coord/coord_main.c
index e3e8c7d32..fe0247a47 100644
--- a/ieee802154/coord/coord_main.c
+++ b/wireless/ieee802154/coord/coord_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/ieee802154/coord/coord_main.c
+ * apps/wireless/ieee802154/coord/coord_main.c
  *
  *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved.
@@ -138,7 +138,6 @@ static pthread_t g_daemon_pid;
 
 static int coord_beacon(FAR struct ieee_coord_s *coord)
 {
-  FAR struct ieee_frame_s *rx = &coord->rxbuf;
   printf("Beacon!\n");
   return 0;
 }
diff --git a/wireless/ieee802154/i8sak/.gitignore b/wireless/ieee802154/i8sak/.gitignore
new file mode 100644
index 000000000..fa1ec7579
--- /dev/null
+++ b/wireless/ieee802154/i8sak/.gitignore
@@ -0,0 +1,11 @@
+/Make.dep
+/.depend
+/.built
+/*.asm
+/*.obj
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
diff --git a/ieee802154/i8sak/Kconfig b/wireless/ieee802154/i8sak/Kconfig
similarity index 100%
rename from ieee802154/i8sak/Kconfig
rename to wireless/ieee802154/i8sak/Kconfig
diff --git a/ieee802154/i8sak/Make.defs b/wireless/ieee802154/i8sak/Make.defs
similarity index 95%
rename from ieee802154/i8sak/Make.defs
rename to wireless/ieee802154/i8sak/Make.defs
index 28f871e65..f13a65b1c 100644
--- a/ieee802154/i8sak/Make.defs
+++ b/wireless/ieee802154/i8sak/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ieee802154/i8sak/Make.defs
+# apps/wireless/ieee802154/i8sak/Make.defs
 # Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -35,5 +35,5 @@
 ############################################################################
 
 ifeq ($(CONFIG_IEEE802154_I8SAK),y)
-CONFIGURED_APPS += ieee802154/i8sak
+CONFIGURED_APPS += wireless/ieee802154/i8sak
 endif
diff --git a/ieee802154/i8sak/Makefile b/wireless/ieee802154/i8sak/Makefile
similarity index 96%
rename from ieee802154/i8sak/Makefile
rename to wireless/ieee802154/i8sak/Makefile
index 37fcd8dd0..ce4b8bec4 100644
--- a/ieee802154/i8sak/Makefile
+++ b/wireless/ieee802154/i8sak/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ieee802154/i8sak/Makefile
+# apps/wireless/ieee802154/i8sak/Makefile
 #
 #   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
 #   Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved.
@@ -62,12 +62,12 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
 endif
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN = ..\..\libapps$(LIBEXT)
+  BIN = ..\..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN = ..\\..\\libapps$(LIBEXT)
+  BIN = ..\\..\\..\\libapps$(LIBEXT)
 else
-  BIN = ../../libapps$(LIBEXT)
+  BIN = ../../../libapps$(LIBEXT)
 endif
 endif
 
diff --git a/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c
similarity index 99%
rename from ieee802154/i8sak/i8sak_main.c
rename to wireless/ieee802154/i8sak/i8sak_main.c
index 679d16f4c..fdc946cc5 100644
--- a/ieee802154/i8sak/i8sak_main.c
+++ b/wireless/ieee802154/i8sak/i8sak_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ieee802154/i8sak/i8sak_main.c
+ * apps/wireless/ieee802154/i8sak/i8sak_main.c
  * IEEE 802.15.4 Swiss Army Knife
  *
  *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
@@ -346,7 +346,7 @@ static FAR void *sniff(FAR void *arg)
       display(chan, &g_rxpacket, sa->verbose);
     }
 
-  return (FAR void*)ret;
+  return (FAR void *)((uintptr_t)ret);
 }
 
 /****************************************************************************
@@ -540,7 +540,7 @@ int i8_main(int argc, char *argv[])
 
       args.fd = fd;
       args.verbose = FALSE;
-      ret = (int)sniff(&args);
+      ret = (int)((intptr_t)sniff(&args));
 
       ret = ieee802154_setpromisc(fd, FALSE);