diff --git a/.idea/f103-simon.iml b/.idea/f103-bluepill.iml
similarity index 96%
rename from .idea/f103-simon.iml
rename to .idea/f103-bluepill.iml
index fc8fe8a..4895957 100644
--- a/.idea/f103-simon.iml
+++ b/.idea/f103-bluepill.iml
@@ -2,7 +2,6 @@
 <module type="CPP_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/bluepill.cmake" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/User/utils/debug.h" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/User/utils/timebase.h" isTestSource="false" />
@@ -19,26 +18,27 @@
       <sourceFolder url="file://$MODULE_DIR$/User/user_main.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/User/init.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/User/handlers.c" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_hal_msp.c" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/f103.cmake" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Src/gpio.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_it.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Src/main.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Src/usart.c" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_hal_msp.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/STM32F103C8Tx_FLASH.ld" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="Header Search Paths">
         <CLASSES>
+          <root url="file:///usr/arm-none-eabi/include" />
           <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include-fixed" />
           <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include" />
-          <root url="file:///usr/arm-none-eabi/include" />
           <root url="file://$MODULE_DIR$/Drivers" />
         </CLASSES>
         <SOURCES>
+          <root url="file:///usr/arm-none-eabi/include" />
           <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include-fixed" />
           <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include" />
-          <root url="file:///usr/arm-none-eabi/include" />
           <root url="file://$MODULE_DIR$/Drivers" />
         </SOURCES>
       </library>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 42a546e..57042b2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CMakeWorkspace" PROJECT_DIR="$USER_HOME$/devel/f103-bluepill" />
   <component name="CidrRootsConfiguration">
     <libraryRoots>
-      <file path="$PROJECT_DIR$/Drivers" />
+      <file path="$USER_HOME$/devel/f103-bluepill/Drivers" />
     </libraryRoots>
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -16,4 +16,4 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 430bc25..34b4842 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/f103-simon.iml" filepath="$PROJECT_DIR$/.idea/f103-simon.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/f103-bluepill.iml" filepath="$PROJECT_DIR$/.idea/f103-bluepill.iml" />
     </modules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e63899..7901673 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(f103-simon C ASM)
+project(f103-bluepill C ASM)
 cmake_minimum_required(VERSION 3.5.0)
 
 file(GLOB_RECURSE USER_SOURCES "Src/*.c" "User/*.c")
diff --git a/Src/main.c b/Src/main.c
index 6ae0fcc..cebf899 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -36,6 +36,7 @@
 #include "gpio.h"
 
 /* USER CODE BEGIN Includes */
+#include "handlers.h"
 #include "user_main.h"
 /* USER CODE END Includes */
 
diff --git a/bluepill.ioc b/f103-bluepill.ioc
similarity index 100%
rename from bluepill.ioc
rename to f103-bluepill.ioc
diff --git a/bluepill.xml b/f103-bluepill.xml
similarity index 92%
rename from bluepill.xml
rename to f103-bluepill.xml
index 94e509b..5f73183 100644
--- a/bluepill.xml
+++ b/f103-bluepill.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <targetDefinitions xmlns="http://openstm32.org/stm32TargetDefinitions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openstm32.org/stm32TargetDefinitions stm32TargetDefinitions.xsd">
   <board id="f103-simon">
-    <name>f103-simon</name>
+    <name>f103-bluepill</name>
     <mcuId>STM32F103C8Tx</mcuId>  <!-- mcu-->
     <dbgIF>SWD</dbgIF>
     <dbgDEV />
diff --git a/bluepill.cmake b/f103.cmake
similarity index 100%
rename from bluepill.cmake
rename to f103.cmake