diff --git a/hw/bsp/msp430/boards/msp_exp430f5529lp/board.h b/hw/bsp/msp430/boards/msp_exp430f5529lp/board.h
new file mode 100644
index 00000000..ccfe321c
--- /dev/null
+++ b/hw/bsp/msp430/boards/msp_exp430f5529lp/board.h
@@ -0,0 +1,46 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021, Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#define LED_PORT              P1OUT
+#define LED_PIN               BIT0
+#define LED_STATE_ON          1
+
+#define BUTTON_PORT           P1IN
+#define BUTTON_PIN            BIT1
+#define BUTTON_STATE_ACTIVE   0
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif
diff --git a/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c b/hw/bsp/msp430/family.c
similarity index 96%
rename from hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c
rename to hw/bsp/msp430/family.c
index e9336b63..4b8ae393 100644
--- a/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c
+++ b/hw/bsp/msp430/family.c
@@ -24,8 +24,8 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "../board.h"
-
+#include "bsp/board.h"
+#include "board.h"
 #include "msp430.h"
 
 //--------------------------------------------------------------------+
@@ -39,13 +39,6 @@ void __attribute__ ((interrupt(USB_UBM_VECTOR))) USB_UBM_ISR(void)
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM
 //--------------------------------------------------------------------+
-#define LED_PORT              P1OUT
-#define LED_PIN               BIT0
-#define LED_STATE_ON          1
-
-#define BUTTON_PORT           P1IN
-#define BUTTON_PIN            BIT1
-#define BUTTON_STATE_ACTIVE   0
 
 uint32_t cnt = 0;
 
diff --git a/hw/bsp/msp_exp430f5529lp/board.mk b/hw/bsp/msp430/family.mk
similarity index 91%
rename from hw/bsp/msp_exp430f5529lp/board.mk
rename to hw/bsp/msp430/family.mk
index 9fe8da27..870b2716 100644
--- a/hw/bsp/msp_exp430f5529lp/board.mk
+++ b/hw/bsp/msp430/family.mk
@@ -14,7 +14,9 @@ LD_FILE = hw/mcu/ti/msp430/msp430-gcc-support-files/include/msp430f5529.ld
 LDINC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
 LDFLAGS += $(addprefix -L,$(LDINC))
 
-INC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
+INC += \
+	$(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include \
+	$(TOP)/$(BOARD_PATH)
 
 # For TinyUSB port source
 VENDOR = ti
diff --git a/hw/bsp/nrf/family.c b/hw/bsp/nrf/family.c
index 48f560a6..fc5e805d 100644
--- a/hw/bsp/nrf/family.c
+++ b/hw/bsp/nrf/family.c
@@ -25,7 +25,6 @@
  */
 
 #include "bsp/board.h"
-
 #include "board.h"
 
 #include "nrfx.h"