diff --git a/src/2jciebu01-ble/CMakeLists.txt b/src/2jciebu01-ble/CMakeLists.txt
deleted file mode 100644
index 5a746256..00000000
--- a/src/2jciebu01-ble/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-if (TINYB_FOUND)
-  set (libname "2jciebu01-ble")
-  set (libdescription "Omron BLE Environment Sensor")
-  set (module_src "2jciebu01_ble.cxx")
-  set (module_hpp "2jciebu01_ble.hpp")
-
-  set (reqlibname "libtinyb")
-  upm_module_init(2jciebu01-usb ${TINYB_LIBRARIES})
-  target_include_directories(${libname} PUBLIC ${TINYB_INCLUDE_DIRS})
-endif()
\ No newline at end of file
diff --git a/src/2jciebu01-usb/CMakeLists.txt b/src/2jciebu01-usb/CMakeLists.txt
deleted file mode 100644
index 682b4a15..00000000
--- a/src/2jciebu01-usb/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set (libname "2jciebu01-usb")
-set (libdescription "Omron USB Environment Sensor")
-set (module_src "2jciebu01_usb.cxx" "2jciebu01.cxx")
-set (module_hpp "2jciebu01_usb.hpp" "2jciebu01.hpp")
-upm_module_init(mraa)
diff --git a/src/2jciebu01-ble/2jciebu01_ble.cxx b/src/2jciebu01_ble/2jciebu01_ble.cxx
similarity index 100%
rename from src/2jciebu01-ble/2jciebu01_ble.cxx
rename to src/2jciebu01_ble/2jciebu01_ble.cxx
diff --git a/src/2jciebu01-ble/2jciebu01_ble.hpp b/src/2jciebu01_ble/2jciebu01_ble.hpp
similarity index 100%
rename from src/2jciebu01-ble/2jciebu01_ble.hpp
rename to src/2jciebu01_ble/2jciebu01_ble.hpp
diff --git a/src/2jciebu01-ble/2jciebu01_ble.i b/src/2jciebu01_ble/2jciebu01_ble.i
similarity index 82%
rename from src/2jciebu01-ble/2jciebu01_ble.i
rename to src/2jciebu01_ble/2jciebu01_ble.i
index 70b183e3..a537cb89 100644
--- a/src/2jciebu01-ble/2jciebu01_ble.i
+++ b/src/2jciebu01_ble/2jciebu01_ble.i
@@ -1,5 +1,5 @@
 #ifdef SWIGPYTHON
-%module (package="upm") 2jciebu01_ble
+%module (package="upm") om2jciebu01_ble
 #endif
 
 %include "../common_top.i"
@@ -10,13 +10,12 @@ JAVA_JNI_LOADLIBRARY(javaupm_2jciebu01_ble)
 #endif
 /* END Java syntax */
 
+%import "2jciebu01.hpp"
+
 /* BEGIN Common SWIG syntax ------------------------------------------------- */
 %{
 #include "2jciebu01_ble.hpp"
-#include "2jciebu01.hpp"
 %}
 
 %include "2jciebu01_ble.hpp"
-%include "2jciebu01.hpp"
-
 /* END Common SWIG syntax */
diff --git a/src/2jciebu01-ble/2jciebu01_ble.json b/src/2jciebu01_ble/2jciebu01_ble.json
similarity index 100%
rename from src/2jciebu01-ble/2jciebu01_ble.json
rename to src/2jciebu01_ble/2jciebu01_ble.json
diff --git a/src/2jciebu01_ble/CMakeLists.txt b/src/2jciebu01_ble/CMakeLists.txt
new file mode 100644
index 00000000..b954bb6c
--- /dev/null
+++ b/src/2jciebu01_ble/CMakeLists.txt
@@ -0,0 +1,8 @@
+if (TINYB_FOUND)
+  set (libname "2jciebu01_ble")
+  set (libdescription "Omron BLE Environment Sensor")
+  set (module_src "${libname}.cxx")
+  set (module_hpp "${libname}.hpp")
+
+  upm_module_init(tinyb 2jciebu01_usb)
+endif()
diff --git a/src/2jciebu01-usb/2jciebu01.cxx b/src/2jciebu01_usb/2jciebu01.cxx
similarity index 100%
rename from src/2jciebu01-usb/2jciebu01.cxx
rename to src/2jciebu01_usb/2jciebu01.cxx
diff --git a/src/2jciebu01-usb/2jciebu01.hpp b/src/2jciebu01_usb/2jciebu01.hpp
similarity index 100%
rename from src/2jciebu01-usb/2jciebu01.hpp
rename to src/2jciebu01_usb/2jciebu01.hpp
diff --git a/src/2jciebu01-usb/2jciebu01_usb.cxx b/src/2jciebu01_usb/2jciebu01_usb.cxx
similarity index 100%
rename from src/2jciebu01-usb/2jciebu01_usb.cxx
rename to src/2jciebu01_usb/2jciebu01_usb.cxx
diff --git a/src/2jciebu01-usb/2jciebu01_usb.hpp b/src/2jciebu01_usb/2jciebu01_usb.hpp
similarity index 100%
rename from src/2jciebu01-usb/2jciebu01_usb.hpp
rename to src/2jciebu01_usb/2jciebu01_usb.hpp
diff --git a/src/2jciebu01-usb/2jciebu01_usb.i b/src/2jciebu01_usb/2jciebu01_usb.i
similarity index 91%
rename from src/2jciebu01-usb/2jciebu01_usb.i
rename to src/2jciebu01_usb/2jciebu01_usb.i
index 13c6ff24..0449917b 100644
--- a/src/2jciebu01-usb/2jciebu01_usb.i
+++ b/src/2jciebu01_usb/2jciebu01_usb.i
@@ -1,5 +1,5 @@
 #ifdef SWIGPYTHON
-%module (package="upm") 2jciebu01_usb
+%module (package="upm") om2jciebu01_usb
 #endif
 
 %include "../common_top.i"
@@ -12,11 +12,10 @@ JAVA_JNI_LOADLIBRARY(javaupm_2jciebu01_usb)
 
 /* BEGIN Common SWIG syntax ------------------------------------------------- */
 %{
-#include "2jciebu01_usb.hpp"
 #include "2jciebu01.hpp"
+#include "2jciebu01_usb.hpp"
 %}
 
-%include "2jciebu01_usb.hpp"
 %include "2jciebu01.hpp"
-
+%include "2jciebu01_usb.hpp"
 /* END Common SWIG syntax */
diff --git a/src/2jciebu01-usb/2jciebu01_usb.json b/src/2jciebu01_usb/2jciebu01_usb.json
similarity index 100%
rename from src/2jciebu01-usb/2jciebu01_usb.json
rename to src/2jciebu01_usb/2jciebu01_usb.json
diff --git a/src/2jciebu01_usb/CMakeLists.txt b/src/2jciebu01_usb/CMakeLists.txt
new file mode 100644
index 00000000..dfa699fb
--- /dev/null
+++ b/src/2jciebu01_usb/CMakeLists.txt
@@ -0,0 +1,5 @@
+set (libname "2jciebu01_usb")
+set (libdescription "Omron USB Environment Sensor")
+set (module_src "${libname}.cxx" "2jciebu01.cxx")
+set (module_hpp "${libname}.hpp" "2jciebu01.hpp")
+upm_module_init(mraa)
diff --git a/src/javaswig_blacklist b/src/javaswig_blacklist
index e69de29b..402b20a5 100644
--- a/src/javaswig_blacklist
+++ b/src/javaswig_blacklist
@@ -0,0 +1 @@
+2jciebu01_ble
\ No newline at end of file