diff --git a/applications/furi_test/furi_test.c b/applications/furi_test/furi_test.c
new file mode 100644
index 00000000..e69de29b
diff --git a/applications/furi_test/furi_test.h b/applications/furi_test/furi_test.h
new file mode 100644
index 00000000..e69de29b
diff --git a/app/app.cpp b/core/app.cpp
similarity index 100%
rename from app/app.cpp
rename to core/app.cpp
diff --git a/app/flipper.h b/core/flipper.h
similarity index 100%
rename from app/flipper.h
rename to core/flipper.h
diff --git a/core/furi.c b/core/furi.c
new file mode 100644
index 00000000..e69de29b
diff --git a/core/furi.h b/core/furi.h
new file mode 100644
index 00000000..e69de29b
diff --git a/app/write.c b/core/write.c
similarity index 100%
rename from app/write.c
rename to core/write.c
diff --git a/target_lo/Makefile b/target_lo/Makefile
index 93bdd886..93b7fc3e 100644
--- a/target_lo/Makefile
+++ b/target_lo/Makefile
@@ -23,9 +23,9 @@ BUILD_DIR = build
 C_SOURCES =  \
 Src/main.c
 
-CPP_SOURCES = ../app/app.cpp
+CPP_SOURCES = ../core/app.cpp
 
-C_SOURCES += ../app/write.c
+C_SOURCES += ../core/write.c
 C_SOURCES += Src/flipper_hal.c
 C_SOURCES += Src/lo_os.c
 C_SOURCES += Src/lo_hal.c