diff --git a/.cproject b/.cproject
new file mode 100644
index 0000000..d66b3fa
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..7ac613c
--- /dev/null
+++ b/.project
@@ -0,0 +1,27 @@
+
+
+ bm-bsp
+
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.core.ccnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
diff --git a/env/TGC5L/platform.h b/env/TGC5L/platform.h
index e5115cc..7dbb739 100644
--- a/env/TGC5L/platform.h
+++ b/env/TGC5L/platform.h
@@ -7,7 +7,7 @@
#define MCAUSE_INT 0x80000000
#define MCAUSE_CAUSE 0x7FFFFFFF
-#include "rtl/const.h"
+#include "bits.h"
/****************************************************************************
* Platform definitions
*****************************************************************************/
diff --git a/env/ehrenberg/init.c b/env/ehrenberg/init.c
index e1fc54e..2ae1f7a 100644
--- a/env/ehrenberg/init.c
+++ b/env/ehrenberg/init.c
@@ -4,7 +4,6 @@
#include "platform.h"
#include "encoding.h"
-#include
#if __riscv_xlen == 32
#define MCAUSE_INT 0x80000000UL
diff --git a/env/ehrenberg/platform.h b/env/ehrenberg/platform.h
index 632f54d..cec65bd 100644
--- a/env/ehrenberg/platform.h
+++ b/env/ehrenberg/platform.h
@@ -7,15 +7,13 @@
#define MCAUSE_INT 0x80000000
#define MCAUSE_CAUSE 0x7FFFFFFF
-#include "ehrenberg/const.h"
-
#define APB_BUS
-#include "devices/gpio.h"
-#include "devices/interrupt.h"
-#include "devices/timer.h"
-#include "devices/uart.h"
-#include "devices/qspi.h"
+#include "ehrenberg/devices/gpio.h"
+#include "ehrenberg/devices/interrupt.h"
+#include "ehrenberg/devices/timer.h"
+#include "ehrenberg/devices/uart.h"
+#include "ehrenberg/devices/qspi.h"
#define PERIPH(TYPE, ADDR) ((volatile TYPE*) (ADDR))
diff --git a/env/entry.S b/env/entry.S
index 982c664..fef8b9e 100644
--- a/env/entry.S
+++ b/env/entry.S
@@ -4,7 +4,7 @@
#define ENTRY_S
#include "encoding.h"
-#include "rtl/bits.h"
+#include "bits.h"
.section .text.entry
.align 2
diff --git a/env/hifive1/init.c b/env/hifive1/init.c
index 1e6c7aa..621a6e2 100644
--- a/env/hifive1/init.c
+++ b/env/hifive1/init.c
@@ -2,7 +2,7 @@
#include
#include
-#include "../hifive1/platform.h"
+#include "platform.h"
#include "encoding.h"
extern int main(int argc, char** argv);
diff --git a/env/iss/platform.h b/env/iss/platform.h
index 59e6fd5..6c70be3 100644
--- a/env/iss/platform.h
+++ b/env/iss/platform.h
@@ -7,7 +7,7 @@
#define MCAUSE_INT 0x80000000
#define MCAUSE_CAUSE 0x7FFFFFFF
-#include "rtl/const.h"
+#include "bits.h"
/****************************************************************************
* Platform definitions
*****************************************************************************/
diff --git a/env/tgc-vp/platform.h b/env/tgc-vp/platform.h
index e92d254..9c6caa7 100644
--- a/env/tgc-vp/platform.h
+++ b/env/tgc-vp/platform.h
@@ -7,7 +7,7 @@
#define MCAUSE_INT 0x80000000
#define MCAUSE_CAUSE 0x7FFFFFFF
-#include "tgc-vp/const.h"
+#include "bits.h"
#include "tgc-vp/devices/aon.h"
#include "tgc-vp/devices/clint.h"
#include "tgc-vp/devices/gpio.h"