diff --git a/immarkdown/cimmarkdown_callbacks.go b/immarkdown/callbacks.go
similarity index 99%
rename from immarkdown/cimmarkdown_callbacks.go
rename to immarkdown/callbacks.go
index f49994a1a..3c4e15976 100644
--- a/immarkdown/cimmarkdown_callbacks.go
+++ b/immarkdown/callbacks.go
@@ -6,8 +6,8 @@ package immarkdown
 // #include <stdlib.h>
 // #include <memory.h>
 // #include "../imgui/extra_types.h"
-// #include "cimmarkdown_wrapper.h"
-// #include "cimmarkdown_typedefs.h"
+// #include "wrapper.h"
+// #include "typedefs.h"
 // extern void callbackMarkdownFormalCallback0(MarkdownFormatInfo*, bool);
 // extern void callbackMarkdownFormalCallback1(MarkdownFormatInfo*, bool);
 // extern void callbackMarkdownFormalCallback2(MarkdownFormatInfo*, bool);
diff --git a/immarkdown/dummy.go b/immarkdown/dummy.go
deleted file mode 100644
index 17257cb8e..000000000
--- a/immarkdown/dummy.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build rquired
-// +build rquired
-
-package imgui
-
-import (
-	_ "github.com/AllenDang/cimgui-go"
-)
diff --git a/immarkdown/cimmarkdown_enums.go b/immarkdown/enums.go
similarity index 100%
rename from immarkdown/cimmarkdown_enums.go
rename to immarkdown/enums.go
diff --git a/immarkdown/cimmarkdown_funcs.go b/immarkdown/funcs.go
similarity index 99%
rename from immarkdown/cimmarkdown_funcs.go
rename to immarkdown/funcs.go
index 90770add0..e7ecaaa63 100644
--- a/immarkdown/cimmarkdown_funcs.go
+++ b/immarkdown/funcs.go
@@ -11,8 +11,8 @@ import (
 )
 
 // #include "../imgui/extra_types.h"
-// #include "cimmarkdown_structs_accessor.h"
-// #include "cimmarkdown_wrapper.h"
+// #include "structs_accessor.h"
+// #include "wrapper.h"
 import "C"
 
 func IsCharInsideWord(c_ rune) bool {
diff --git a/immarkdown/cimmarkdown_structs_accessor.cpp b/immarkdown/structs_accessor.cpp
similarity index 99%
rename from immarkdown/cimmarkdown_structs_accessor.cpp
rename to immarkdown/structs_accessor.cpp
index f0ee9d2b3..2953de25c 100644
--- a/immarkdown/cimmarkdown_structs_accessor.cpp
+++ b/immarkdown/structs_accessor.cpp
@@ -3,8 +3,8 @@
 
 
 #include <string.h>
-#include "cimmarkdown_wrapper.h"
-#include "cimmarkdown_structs_accessor.h"
+#include "wrapper.h"
+#include "structs_accessor.h"
 
 void wrap_Emphasis_SetState(Emphasis *EmphasisPtr, EmphasisState v) { EmphasisPtr->state = v; }
 EmphasisState wrap_Emphasis_GetState(Emphasis *self) { return self->state; }
diff --git a/immarkdown/cimmarkdown_structs_accessor.h b/immarkdown/structs_accessor.h
similarity index 99%
rename from immarkdown/cimmarkdown_structs_accessor.h
rename to immarkdown/structs_accessor.h
index 823fe21d5..b7503bf66 100644
--- a/immarkdown/cimmarkdown_structs_accessor.h
+++ b/immarkdown/structs_accessor.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "cimmarkdown_wrapper.h"
+#include "wrapper.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/immarkdown/cimmarkdown_typedefs.cpp b/immarkdown/typedefs.cpp
similarity index 79%
rename from immarkdown/cimmarkdown_typedefs.cpp
rename to immarkdown/typedefs.cpp
index 23c923154..351a6faf1 100644
--- a/immarkdown/cimmarkdown_typedefs.cpp
+++ b/immarkdown/typedefs.cpp
@@ -2,5 +2,5 @@
 // DO NOT EDIT.
 
 
-#include "cimmarkdown_typedefs.h"
+#include "typedefs.h"
 #include "../cwrappers/cimmarkdown.h"
diff --git a/immarkdown/cimmarkdown_typedefs.go b/immarkdown/typedefs.go
similarity index 99%
rename from immarkdown/cimmarkdown_typedefs.go
rename to immarkdown/typedefs.go
index ab91bb8f8..6ccf6ae8b 100644
--- a/immarkdown/cimmarkdown_typedefs.go
+++ b/immarkdown/typedefs.go
@@ -6,8 +6,8 @@ package immarkdown
 // #include <stdlib.h>
 // #include <memory.h>
 // #include "../imgui/extra_types.h"
-// #include "cimmarkdown_wrapper.h"
-// #include "cimmarkdown_typedefs.h"
+// #include "wrapper.h"
+// #include "typedefs.h"
 import "C"
 import "github.com/AllenDang/cimgui-go/internal"
 
diff --git a/immarkdown/cimmarkdown_typedefs.h b/immarkdown/typedefs.h
similarity index 100%
rename from immarkdown/cimmarkdown_typedefs.h
rename to immarkdown/typedefs.h
diff --git a/immarkdown/cimmarkdown_wrapper.cpp b/immarkdown/wrapper.cpp
similarity index 97%
rename from immarkdown/cimmarkdown_wrapper.cpp
rename to immarkdown/wrapper.cpp
index f3012b1a0..ad695046b 100644
--- a/immarkdown/cimmarkdown_wrapper.cpp
+++ b/immarkdown/wrapper.cpp
@@ -1,7 +1,7 @@
 // Code generated by cmd/codegen from https://github.com/AllenDang/cimgui-go.
 // DO NOT EDIT.
 
-#include "cimmarkdown_wrapper.h"
+#include "wrapper.h"
 #include "../cwrappers/cimmarkdown.h"
 
 bool wrap_RenderLinkText(TextRegion* self,const char* text_,const Link link_,const char* markdown_,const MarkdownConfig mdConfig_,const char** linkHoverStart_) { return RenderLinkText(self,text_,0,link_,markdown_,mdConfig_,linkHoverStart_); }
diff --git a/immarkdown/cimmarkdown_wrapper.h b/immarkdown/wrapper.h
similarity index 100%
rename from immarkdown/cimmarkdown_wrapper.h
rename to immarkdown/wrapper.h