diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0da17a6..ddd4e2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ include_directories(${ANTLR4_INCLUDE_DIR})
 # Custom sources start here
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/antlrgen)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/3rdparty)
 file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.cc")
 file(GLOB_RECURSE HEADERS "include/*.hpp" "include/*.h" "include/*.hh")
 
diff --git a/Sysy.g4 b/Sysy.g4
index 23ea8b5..89194c8 100644
--- a/Sysy.g4
+++ b/Sysy.g4
@@ -42,7 +42,8 @@ stmt:
 	| 'while' '(' cond ')' stmt				# whileStmt
 	| 'break' ';'							# breakStmt
 	| 'continue' ';'						# continueStmt
-	| 'return' (exp)? ';'					# returnStmt;
+	| 'return' (exp)? ';'					# returnStmt
+	;
 
 exp: addExp;
 
diff --git a/include/fmt/core.h b/include/3rdparty/fmt/core.h
similarity index 100%
rename from include/fmt/core.h
rename to include/3rdparty/fmt/core.h
diff --git a/include/fmt/format-inl.h b/include/3rdparty/fmt/format-inl.h
similarity index 100%
rename from include/fmt/format-inl.h
rename to include/3rdparty/fmt/format-inl.h
diff --git a/include/fmt/format.h b/include/3rdparty/fmt/format.h
similarity index 100%
rename from include/fmt/format.h
rename to include/3rdparty/fmt/format.h
diff --git a/include/common.h b/include/common.h
index 6eaa93d..fdd9e4c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "3rdparty/easylogging++.h"
-#include "fmt/core.h"
+#include "3rdparty/fmt/core.h"
 #include <algorithm>
 #include <any>
 #include <bitset>
diff --git a/src/fmt/format.cc b/src/3rdparty/fmt/format.cc
similarity index 100%
rename from src/fmt/format.cc
rename to src/3rdparty/fmt/format.cc