diff --git a/include/gnuradio/CMakeLists.txt b/include/gnuradio/CMakeLists.txt
deleted file mode 100644
index 44d72cd..0000000
--- a/include/gnuradio/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_subdirectory(ieee802_11)
diff --git a/include/gnuradio/ieee802_11/CMakeLists.txt b/include/ieee802_11/CMakeLists.txt
similarity index 98%
rename from include/gnuradio/ieee802_11/CMakeLists.txt
rename to include/ieee802_11/CMakeLists.txt
index 5ec031a..6ba25c9 100644
--- a/include/gnuradio/ieee802_11/CMakeLists.txt
+++ b/include/ieee802_11/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 list(APPEND include_sources
     api.h
+    ether_encap.h
     ofdm_decode_mac.h
     ofdm_decode_signal.h
     ofdm_equalize_symbols.h
diff --git a/include/gnuradio/ieee802_11/api.h b/include/ieee802_11/api.h
similarity index 79%
rename from include/gnuradio/ieee802_11/api.h
rename to include/ieee802_11/api.h
index 56efc51..d25af7c 100644
--- a/include/gnuradio/ieee802_11/api.h
+++ b/include/ieee802_11/api.h
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_API_H
-#define INCLUDED_GR_IEEE802_11_API_H
+#ifndef INCLUDED_IEEE802_11_API_H
+#define INCLUDED_IEEE802_11_API_H
 
 #include <gnuradio/attributes.h>
 
 #ifdef gnuradio_ieee802_11_EXPORTS
-#  define GR_IEEE802_11_API __GR_ATTR_EXPORT
+#  define IEEE802_11_API __GR_ATTR_EXPORT
 #else
-#  define GR_IEEE802_11_API __GR_ATTR_IMPORT
+#  define IEEE802_11_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_GR_IEEE802_11_API_H */
+#endif /* INCLUDED_IEEE802_11_API_H */
diff --git a/include/ieee802_11/ether_encap.h b/include/ieee802_11/ether_encap.h
new file mode 100644
index 0000000..f91fbca
--- /dev/null
+++ b/include/ieee802_11/ether_encap.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_IEEE802_11_ETHER_ENCAP_H
+#define INCLUDED_IEEE802_11_ETHER_ENCAP_H
+
+#include <ieee802-11/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+namespace ieee802_11 {
+
+class IEEE802_11_API ether_encap : virtual public block
+{
+public:
+
+	typedef boost::shared_ptr<ether_encap> sptr;
+	static sptr make(bool debug);
+
+};
+
+}  // namespace ieee802_11
+}  // namespace gr
+
+#endif /* INCLUDED_IEEE802_11_ETHER_ENCAP_H */
diff --git a/include/gnuradio/ieee802_11/ofdm_decode_mac.h b/include/ieee802_11/ofdm_decode_mac.h
similarity index 78%
rename from include/gnuradio/ieee802_11/ofdm_decode_mac.h
rename to include/ieee802_11/ofdm_decode_mac.h
index 1e64f43..f2c41c7 100644
--- a/include/gnuradio/ieee802_11/ofdm_decode_mac.h
+++ b/include/ieee802_11/ofdm_decode_mac.h
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_OFDM_DECODE_MAC_H
-#define INCLUDED_GR_IEEE802_11_OFDM_DECODE_MAC_H
+#ifndef INCLUDED_IEEE802_11_OFDM_DECODE_MAC_H
+#define INCLUDED_IEEE802_11_OFDM_DECODE_MAC_H
 
-#include <gnuradio/ieee802_11/api.h>
+#include <ieee802-11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {
 namespace ieee802_11 {
 
-class GR_IEEE802_11_API ofdm_decode_mac : virtual public gr::block
+class IEEE802_11_API ofdm_decode_mac : virtual public block
 {
 public:
 
@@ -35,6 +35,6 @@ public:
 }  // namespace ieee802_11
 }  // namespace gr
 
-#endif /* INCLUDED_GR_IEEE802_11_OFDM_DECODE_MAC_H */
+#endif /* INCLUDED_IEEE802_11_OFDM_DECODE_MAC_H */
 
 
diff --git a/include/gnuradio/ieee802_11/ofdm_decode_signal.h b/include/ieee802_11/ofdm_decode_signal.h
similarity index 77%
rename from include/gnuradio/ieee802_11/ofdm_decode_signal.h
rename to include/ieee802_11/ofdm_decode_signal.h
index e11af67..ff7f196 100644
--- a/include/gnuradio/ieee802_11/ofdm_decode_signal.h
+++ b/include/ieee802_11/ofdm_decode_signal.h
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_OFDM_DECODE_SIGNAL_H
-#define INCLUDED_GR_IEEE802_11_OFDM_DECODE_SIGNAL_H
+#ifndef INCLUDED_IEEE802_11_OFDM_DECODE_SIGNAL_H
+#define INCLUDED_IEEE802_11_OFDM_DECODE_SIGNAL_H
 
-#include <gnuradio/ieee802_11/api.h>
+#include <ieee802-11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {
 namespace ieee802_11 {
 
-class GR_IEEE802_11_API ofdm_decode_signal : virtual public gr::block
+class IEEE802_11_API ofdm_decode_signal : virtual public block
 {
 public:
 
@@ -35,5 +35,5 @@ public:
 }  // namespace ieee802_11
 }  // namespace gr
 
-#endif /* INCLUDED_GR_IEEE802_11_OFDM_DECODE_SIGNAL_H */
+#endif /* INCLUDED_IEEE802_11_OFDM_DECODE_SIGNAL_H */
 
diff --git a/include/gnuradio/ieee802_11/ofdm_equalize_symbols.h b/include/ieee802_11/ofdm_equalize_symbols.h
similarity index 77%
rename from include/gnuradio/ieee802_11/ofdm_equalize_symbols.h
rename to include/ieee802_11/ofdm_equalize_symbols.h
index 21cf738..143b265 100644
--- a/include/gnuradio/ieee802_11/ofdm_equalize_symbols.h
+++ b/include/ieee802_11/ofdm_equalize_symbols.h
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_OFDM_EQUALIZE_SYMBOLS_H
-#define INCLUDED_GR_IEEE802_11_OFDM_EQUALIZE_SYMBOLS_H
+#ifndef INCLUDED_IEEE802_11_OFDM_EQUALIZE_SYMBOLS_H
+#define INCLUDED_IEEE802_11_OFDM_EQUALIZE_SYMBOLS_H
 
-#include <gnuradio/ieee802_11/api.h>
+#include <ieee802-11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {
 namespace ieee802_11 {
 
-class GR_IEEE802_11_API ofdm_equalize_symbols : virtual public gr::block
+class IEEE802_11_API ofdm_equalize_symbols : virtual public block
 {
 public:
 
@@ -35,5 +35,5 @@ public:
 }  // namespace ieee802_11
 }  // namespace gr
 
-#endif /* INCLUDED_GR_IEEE802_11_OFDM_EQUALIZE_SYMBOLS_H*/
+#endif /* INCLUDED_IEEE802_11_OFDM_EQUALIZE_SYMBOLS_H*/
 
diff --git a/include/gnuradio/ieee802_11/ofdm_parse_mac.h b/include/ieee802_11/ofdm_parse_mac.h
similarity index 78%
rename from include/gnuradio/ieee802_11/ofdm_parse_mac.h
rename to include/ieee802_11/ofdm_parse_mac.h
index 2a0bb25..c00a4e1 100644
--- a/include/gnuradio/ieee802_11/ofdm_parse_mac.h
+++ b/include/ieee802_11/ofdm_parse_mac.h
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_OFDM_PARSE_MAC_H
-#define INCLUDED_GR_IEEE802_11_OFDM_PARSE_MAC_H
+#ifndef INCLUDED_IEEE802_11_OFDM_PARSE_MAC_H
+#define INCLUDED_IEEE802_11_OFDM_PARSE_MAC_H
 
-#include <gnuradio/ieee802_11/api.h>
+#include <ieee802-11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {
 namespace ieee802_11 {
 
-class GR_IEEE802_11_API ofdm_parse_mac : virtual public gr::block
+class IEEE802_11_API ofdm_parse_mac : virtual public block
 {
 public:
 
@@ -35,4 +35,4 @@ public:
 }  // namespace ieee802_11
 }  // namespace gr
 
-#endif /* INCLUDED_GR_IEEE802_11_OFDM_PARSE_MAC_H */
+#endif /* INCLUDED_IEEE802_11_OFDM_PARSE_MAC_H */
diff --git a/include/gnuradio/ieee802_11/ofdm_sync_long.h b/include/ieee802_11/ofdm_sync_long.h
similarity index 79%
rename from include/gnuradio/ieee802_11/ofdm_sync_long.h
rename to include/ieee802_11/ofdm_sync_long.h
index 98f2959..3700140 100644
--- a/include/gnuradio/ieee802_11/ofdm_sync_long.h
+++ b/include/ieee802_11/ofdm_sync_long.h
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_OFDM_SYNC_LONG_H
-#define INCLUDED_GR_IEEE802_11_OFDM_SYNC_LONG_H
+#ifndef INCLUDED_IEEE802_11_OFDM_SYNC_LONG_H
+#define INCLUDED_IEEE802_11_OFDM_SYNC_LONG_H
 
-#include <gnuradio/ieee802_11/api.h>
+#include <ieee802-11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {
 namespace ieee802_11 {
 
-class GR_IEEE802_11_API ofdm_sync_long : virtual public gr::block
+class IEEE802_11_API ofdm_sync_long : virtual public block
 {
 public:
 
@@ -36,4 +36,4 @@ public:
 }  // namespace ieee802_11
 }  // namespace gr
 
-#endif /* INCLUDED_GR_IEEE802_11_OFDM_SYNC_LONG_H */
+#endif /* INCLUDED_IEEE802_11_OFDM_SYNC_LONG_H */
diff --git a/include/gnuradio/ieee802_11/ofdm_sync_short.h b/include/ieee802_11/ofdm_sync_short.h
similarity index 79%
rename from include/gnuradio/ieee802_11/ofdm_sync_short.h
rename to include/ieee802_11/ofdm_sync_short.h
index 7979379..fb86688 100644
--- a/include/gnuradio/ieee802_11/ofdm_sync_short.h
+++ b/include/ieee802_11/ofdm_sync_short.h
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INCLUDED_GR_IEEE802_11_OFDM_SYNC_SHORT_H
-#define INCLUDED_GR_IEEE802_11_OFDM_SYNC_SHORT_H
+#ifndef INCLUDED_IEEE802_11_OFDM_SYNC_SHORT_H
+#define INCLUDED_IEEE802_11_OFDM_SYNC_SHORT_H
 
-#include <gnuradio/ieee802_11/api.h>
+#include <ieee802-11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {
 namespace ieee802_11 {
 
-class GR_IEEE802_11_API ofdm_sync_short : virtual public gr::block
+class IEEE802_11_API ofdm_sync_short : virtual public block
 {
 public:
 
@@ -36,4 +36,4 @@ public:
 }  // namespace ieee802_11
 }  // namespace gr
 
-#endif /* INCLUDED_GR_IEEE802_11_OFDM_SYNC_SHORT_H */
+#endif /* INCLUDED_IEEE802_11_OFDM_SYNC_SHORT_H */