diff --git a/core/sappyou.c b/tanabata/core/sappyou.c
similarity index 99%
rename from core/sappyou.c
rename to tanabata/core/sappyou.c
index 70f8d9c..7f7b3ac 100644
--- a/core/sappyou.c
+++ b/tanabata/core/sappyou.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "../include/core_func.h"
+#include "../../include/core_func.h"
 
 const Tanzaku HOLE_TANZAKU = {HOLE_ID};
 
diff --git a/core/sasahyou.c b/tanabata/core/sasahyou.c
similarity index 99%
rename from core/sasahyou.c
rename to tanabata/core/sasahyou.c
index 4d5bfe5..ad01f97 100644
--- a/core/sasahyou.c
+++ b/tanabata/core/sasahyou.c
@@ -3,7 +3,7 @@
 #include <time.h>
 #include <stdio.h>
 
-#include "../include/core_func.h"
+#include "../../include/core_func.h"
 
 const Sasa HOLE_SASA = {HOLE_ID};
 
diff --git a/core/shoppyou.c b/tanabata/core/shoppyou.c
similarity index 99%
rename from core/shoppyou.c
rename to tanabata/core/shoppyou.c
index b1c01c9..15ae989 100644
--- a/core/shoppyou.c
+++ b/tanabata/core/shoppyou.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "../include/core_func.h"
+#include "../../include/core_func.h"
 
 const Kazari HOLE_KAZARI = {HOLE_ID};
 
diff --git a/lib/database.c b/tanabata/lib/database.c
similarity index 99%
rename from lib/database.c
rename to tanabata/lib/database.c
index fa85f45..24a6470 100644
--- a/lib/database.c
+++ b/tanabata/lib/database.c
@@ -3,8 +3,8 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include "../include/core_func.h"
-#include "../include/tanabata.h"
+#include "../../include/core_func.h"
+#include "../../include/tanabata.h"
 
 int tanabata_init(Tanabata *tanabata) {
     if (sasahyou_init(&tanabata->sasahyou) != 0 ||
diff --git a/lib/kazari.c b/tanabata/lib/kazari.c
similarity index 97%
rename from lib/kazari.c
rename to tanabata/lib/kazari.c
index 60d25e1..ceb02b7 100644
--- a/lib/kazari.c
+++ b/tanabata/lib/kazari.c
@@ -1,7 +1,7 @@
 #include <malloc.h>
 
-#include "../include/core_func.h"
-#include "../include/tanabata.h"
+#include "../../include/core_func.h"
+#include "../../include/tanabata.h"
 
 int tanabata_kazari_add(Tanabata *tanabata, uint64_t sasa_id, uint64_t tanzaku_id) {
     if (sasa_id >= tanabata->sasahyou.size || tanzaku_id >= tanabata->sappyou.size ||
diff --git a/lib/sasa.c b/tanabata/lib/sasa.c
similarity index 97%
rename from lib/sasa.c
rename to tanabata/lib/sasa.c
index 295fb69..4304001 100644
--- a/lib/sasa.c
+++ b/tanabata/lib/sasa.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../include/core_func.h"
-#include "../include/tanabata.h"
+#include "../../include/core_func.h"
+#include "../../include/tanabata.h"
 
 int tanabata_sasa_add(Tanabata *tanabata, const char *path) {
     if (path == NULL || tanabata->sasahyou.size == -1 && tanabata->sasahyou.hole_cnt == 0) {
diff --git a/lib/tanzaku.c b/tanabata/lib/tanzaku.c
similarity index 97%
rename from lib/tanzaku.c
rename to tanabata/lib/tanzaku.c
index a6bc3e7..f450394 100644
--- a/lib/tanzaku.c
+++ b/tanabata/lib/tanzaku.c
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "../include/core_func.h"
-#include "../include/tanabata.h"
+#include "../../include/core_func.h"
+#include "../../include/tanabata.h"
 
 int tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description) {
     if (name == NULL || description == NULL || tanabata->sappyou.size == -1 && tanabata->sappyou.hole_cnt == 0) {
diff --git a/cli/cli.c b/tfm/cli/tfm-cli.c
similarity index 99%
rename from cli/cli.c
rename to tfm/cli/tfm-cli.c
index b5ddb37..1d62659 100644
--- a/cli/cli.c
+++ b/tfm/cli/tfm-cli.c
@@ -4,8 +4,8 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include "../include/constants.h"
-#include "../include/tanabata.h"
+#include "../../include/constants.h"
+#include "../../include/tanabata.h"
 
 // Stylization macros
 #define TABLE_HEADER(s) ""s""
diff --git a/web/web.go b/web/web-server.go
similarity index 100%
rename from web/web.go
rename to web/web-server.go