diff --git a/BorMakefile b/BorMakefile
index 2f9efa4a..40a73f8e 100644
--- a/BorMakefile
+++ b/BorMakefile
@@ -8,8 +8,9 @@ LDFLAGS = -tWD
 all: src\Mw.dll
 clean: 
 	del /f /q src\core.obj
-	del /f /q src\string.obj
 	del /f /q src\draw.obj
+	del /f /q src\string.obj
+	del /f /q src\text.obj
 	del /f /q src\default.obj
 	del /f /q src\lowlevel.obj
 	del /f /q src\error.obj
@@ -60,13 +61,12 @@ clean:
 	del /f /q src\dialog\filechooser.obj
 	del /f /q src\dialog\colorpicker.obj
 	del /f /q src\dialog\messagebox.obj
-	del /f /q src\abstract\text.obj
 	del /f /q src\abstract\directory.obj
 	del /f /q src\backend\gdi.obj
 	del /f /q src\Mw.dll
 
-src\Mw.dll:  src\core.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\text.obj src\abstract\directory.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  -e$@  src\core.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\text.obj src\abstract\directory.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
+src\Mw.dll:  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\directory.obj src\backend\gdi.obj
+	$(LD) $(LDFLAGS)  -e$@  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\directory.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
 	implib src\Mw.lib src\Mw.dll
 
 .c.obj:
diff --git a/GNUmakefile b/GNUmakefile
index 50226653..69838882 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -24,12 +24,12 @@ L_CFLAGS = $(DEPINC) $(CFLAGS) -fPIC -D_MILSKO
 L_LDFLAGS = $(LDFLAGS)
 L_LIBS = $(LIBS)
 
-L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/string.o
+L_OBJS = src/core.o src/default.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/string.o src/text.o src/draw.o
 L_OBJS += external/stb_ds.o external/stb_image.o external/stb_truetype.o
 
 L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o src/widget/numberentry.o src/widget/viewport.o src/widget/listbox.o src/widget/progressbar.o src/widget/radiobox.o
 L_OBJS += src/dialog/filechooser.o src/dialog/colorpicker.o src/dialog/messagebox.o
-L_OBJS += src/abstract/directory.o src/abstract/text.o
+L_OBJS += src/abstract/directory.o
 
 L_OBJS += src/cursor/hidden.o src/cursor/default.o src/cursor/cross.o src/cursor/text.o
 L_OBJS += src/icon/warning.o src/icon/note.o src/icon/info.o src/icon/news.o src/icon/error.o src/icon/file.o src/icon/directory.o src/icon/back.o src/icon/forward.o src/icon/up.o src/icon/down.o src/icon/left.o src/icon/right.o src/icon/computer.o src/icon/search.o
diff --git a/NTMakefile b/NTMakefile
index 61fd00c1..05b0ae2a 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -8,8 +8,9 @@ LDFLAGS = /DLL
 all: src\Mw.dll
 clean: 
 	del /f /q src\core.obj
-	del /f /q src\string.obj
 	del /f /q src\draw.obj
+	del /f /q src\string.obj
+	del /f /q src\text.obj
 	del /f /q src\default.obj
 	del /f /q src\lowlevel.obj
 	del /f /q src\error.obj
@@ -60,13 +61,12 @@ clean:
 	del /f /q src\dialog\filechooser.obj
 	del /f /q src\dialog\colorpicker.obj
 	del /f /q src\dialog\messagebox.obj
-	del /f /q src\abstract\text.obj
 	del /f /q src\abstract\directory.obj
 	del /f /q src\backend\gdi.obj
 	del /f /q src\Mw.dll
 
-src\Mw.dll:  src\core.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\text.obj src\abstract\directory.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  /OUT:$@  src\core.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\text.obj src\abstract\directory.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
+src\Mw.dll:  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\directory.obj src\backend\gdi.obj
+	$(LD) $(LDFLAGS)  /OUT:$@  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\directory.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
 	
 
 .c.obj:
diff --git a/WatMakefile b/WatMakefile
index 892d1b1c..3ccddc2e 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -7,8 +7,9 @@ LDFLAGS = system nt_dll
 all: src/Mw.dll
 clean: .SYMBOLIC
 	%erase src/core.obj
-	%erase src/string.obj
 	%erase src/draw.obj
+	%erase src/string.obj
+	%erase src/text.obj
 	%erase src/default.obj
 	%erase src/lowlevel.obj
 	%erase src/error.obj
@@ -59,21 +60,22 @@ clean: .SYMBOLIC
 	%erase src/dialog/filechooser.obj
 	%erase src/dialog/colorpicker.obj
 	%erase src/dialog/messagebox.obj
-	%erase src/abstract/text.obj
 	%erase src/abstract/directory.obj
 	%erase src/backend/gdi.obj
 	%erase src/Mw.dll
 
-src/Mw.dll:  src/core.obj src/string.obj src/draw.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/dialog/filechooser.obj src/dialog/colorpicker.obj src/dialog/messagebox.obj src/abstract/text.obj src/abstract/directory.obj src/backend/gdi.obj
-	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/core.obj file src/string.obj file src/draw.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/dialog/filechooser.obj file src/dialog/colorpicker.obj file src/dialog/messagebox.obj file src/abstract/text.obj file src/abstract/directory.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
+src/Mw.dll:  src/core.obj src/draw.obj src/string.obj src/text.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/dialog/filechooser.obj src/dialog/colorpicker.obj src/dialog/messagebox.obj src/abstract/directory.obj src/backend/gdi.obj
+	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/core.obj file src/draw.obj file src/string.obj file src/text.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/dialog/filechooser.obj file src/dialog/colorpicker.obj file src/dialog/messagebox.obj file src/abstract/directory.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
 	
 
 
 src/core.obj: src/core.c
 	$(CC) $(CFLAGS) -fo=$@ $<
+src/draw.obj: src/draw.c
+	$(CC) $(CFLAGS) -fo=$@ $<
 src/string.obj: src/string.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/draw.obj: src/draw.c
+src/text.obj: src/text.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/default.obj: src/default.c
 	$(CC) $(CFLAGS) -fo=$@ $<
@@ -175,8 +177,6 @@ src/dialog/colorpicker.obj: src/dialog/colorpicker.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/dialog/messagebox.obj: src/dialog/messagebox.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/abstract/text.obj: src/abstract/text.c
-	$(CC) $(CFLAGS) -fo=$@ $<
 src/abstract/directory.obj: src/abstract/directory.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/backend/gdi.obj: src/backend/gdi.c
diff --git a/include/Mw/Directory.h b/include/Mw/Abstract/Directory.h
similarity index 89%
rename from include/Mw/Directory.h
rename to include/Mw/Abstract/Directory.h
index 4a9bb60f..80073e41 100644
--- a/include/Mw/Directory.h
+++ b/include/Mw/Abstract/Directory.h
@@ -1,10 +1,10 @@
 /* $Id$ */
 /*!
- * @file Mw/Directory.h
+ * @file Mw/Abstract/Directory.h
  * @brief Directory functions
  */
-#ifndef __MW_DIRECTORY_H__
-#define __MW_DIRECTORY_H__
+#ifndef __MW_ABSTRACT_DIRECTORY_H__
+#define __MW_ABSTRACT_DIRECTORY_H__
 
 #include <Mw/MachDep.h>
 #include <Mw/TypeDefs.h>
diff --git a/include/Mw/Draw.h b/include/Mw/Draw.h
index ef029a68..0b8a5a68 100644
--- a/include/Mw/Draw.h
+++ b/include/Mw/Draw.h
@@ -89,17 +89,6 @@ MWDECL void MwDrawTriangle(MwWidget handle, MwRect* rect, MwLLColor color, int i
  */
 MWDECL void MwDrawFrameEx(MwWidget handle, MwRect* rect, MwLLColor color, int invert, int border);
 
-/*!
- * @brief Draws a text
- * @param handle Widget
- * @param point Center point of the text
- * @param text Text
- * @param bold Bold
- * @param align Align
- * @param color Color
- */
-MWDECL void MwDrawText(MwWidget handle, MwPoint* point, const char* text, int bold, int align, MwLLColor color);
-
 /*!
  * @brief Creates a pixmap from image
  * @param handle Widget
@@ -108,22 +97,6 @@ MWDECL void MwDrawText(MwWidget handle, MwPoint* point, const char* text, int bo
  */
 MWDECL MwLLPixmap MwLoadImage(MwWidget handle, const char* path);
 
-/*!
- * @brief Calculates a text width
- * @param handle Widget
- * @param text Text
- * @return Text width
- */
-MWDECL int MwTextWidth(MwWidget handle, const char* text);
-
-/*!
- * @brief Calculates a text height
- * @param handle Widget
- * @param text Text
- * @return Text height
- */
-MWDECL int MwTextHeight(MwWidget handle, const char* text);
-
 /*!
  * @brief Get color components
  * @param color Color
@@ -178,6 +151,35 @@ MWDECL MwLLPixmap MwLoadIcon(MwWidget handle, unsigned int* data);
  */
 MWDECL void MwDrawDiamond(MwWidget handle, MwRect* rect, MwLLColor color, int invert);
 
+/* text.c */
+
+/*!
+ * @brief Draws a text
+ * @param handle Widget
+ * @param point Center point of the text
+ * @param text Text
+ * @param bold Bold
+ * @param align Align
+ * @param color Color
+ */
+MWDECL void MwDrawText(MwWidget handle, MwPoint* point, const char* text, int bold, int align, MwLLColor color);
+
+/*!
+ * @brief Calculates a text width
+ * @param handle Widget
+ * @param text Text
+ * @return Text width
+ */
+MWDECL int MwTextWidth(MwWidget handle, const char* text);
+
+/*!
+ * @brief Calculates a text height
+ * @param handle Widget
+ * @param text Text
+ * @return Text height
+ */
+MWDECL int MwTextHeight(MwWidget handle, const char* text);
+
 /* color.c */
 
 /*!
diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h
index 709e3581..bb5bb0b8 100644
--- a/include/Mw/Milsko.h
+++ b/include/Mw/Milsko.h
@@ -12,15 +12,16 @@
 #include <Mw/TypeDefs.h>
 #include <Mw/Core.h>
 #include <Mw/Default.h>
-#include <Mw/Draw.h>
 #include <Mw/Font.h>
 #include <Mw/Error.h>
 #include <Mw/Constants.h>
 #include <Mw/Unicode.h>
-#include <Mw/Directory.h>
 #include <Mw/String.h>
+#include <Mw/Draw.h>
 #include <Mw/Version.h>
 
+#include <Mw/Abstract/Directory.h>
+
 #include <Mw/Resource/Icon.h>
 #include <Mw/Resource/Cursor.h>
 
diff --git a/src/draw.c b/src/draw.c
index 04fb5c65..d02d2cac 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -94,6 +94,7 @@ void MwDrawRect(MwWidget handle, MwRect* rect, MwLLColor color) {
 
 	MwLLPolygon(handle->lowlevel, p, 4, color);
 }
+
 void MwDrawRectFading(MwWidget handle, MwRect* rect, MwLLColor color) {
 	MwLLPixmap     pixmap;
 	int	       y;
diff --git a/src/abstract/text.c b/src/text.c
similarity index 100%
rename from src/abstract/text.c
rename to src/text.c