diff --git a/rosapps/CMakeLists.txt b/rosapps/CMakeLists.txt
index ea063efff4c..7d40d363077 100644
--- a/rosapps/CMakeLists.txt
+++ b/rosapps/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(applications)
 add_subdirectory(demos)
-add_subdirectory(drivers)
\ No newline at end of file
+add_subdirectory(drivers)
+# add_subdirectory(lib)
\ No newline at end of file
diff --git a/rosapps/applications/devutils/vgafontedit/cpi.h b/rosapps/applications/devutils/vgafontedit/cpi.h
index 51ac1979ff3..53eac01e418 100644
--- a/rosapps/applications/devutils/vgafontedit/cpi.h
+++ b/rosapps/applications/devutils/vgafontedit/cpi.h
@@ -3,10 +3,51 @@
  * LICENSE:     GNU General Public License Version 2.0 or any later version
  * FILE:        devutils/vgafontedit/cpi.h
  * PURPOSE:     CPI (Code Page Information) MS-DOS-compatible Fonts
+ *              We support only screen fonts, not printer fonts.
+ *              No DR-DOS/Novell-DOS compressed font format support.
  * COPYRIGHT:   Copyright 2014 Hermes Belusca-Maito <hermes.belusca@sfr.fr>
  */
 
 #ifndef __CPI_H
 #define __CPI_H
 
+typedef struct _CPI_HEADER
+{
+    UCHAR   uId0;
+    UCHAR   uId[7];
+    UCHAR   uReserved[8];
+    USHORT  uNumPtr;
+    UCHAR   uPtrType;
+    ULONG   uFntInfoHdrOffset;
+
+    // FIXME: Put it in another struct ??
+    USHORT  uNumCodePages;
+} CPI_HEADER, *PCPI_HEADER;
+
+typedef struct _CPENTRY_HEADER
+{
+    USHORT  uHdrSize;
+    ULONG   uNextCPEHOffset;
+    USHORT  uDeviceType;
+    UCHAR   uDeviceName[8];
+    USHORT  uCodePage;
+    UCHAR   uReserved[6];
+    ULONG   uCPIHOffset;
+} CPENTRY_HEADER, *PCPENTRY_HEADER;
+
+typedef struct _CPINFO_HEADER
+{
+    USHORT  uVersion;
+    USHORT  uNumFonts;
+    USHORT  uSize;  // uFontSize
+} CPINFO_HEADER, *PCPINFO_HEADER;
+
+typedef struct _SCRFONT_HEADER
+{
+    UCHAR   uHeight;
+    UCHAR   uWidth;
+    USHORT  uReserved;
+    USHORT  uNumChars;
+} SCRFONT_HEADER, *PSCRFONT_HEADER;
+
 #endif
diff --git a/rosapps/applications/devutils/vgafontedit/precomp.h b/rosapps/applications/devutils/vgafontedit/precomp.h
index 93ec68ac3c0..164c9b6e6fb 100644
--- a/rosapps/applications/devutils/vgafontedit/precomp.h
+++ b/rosapps/applications/devutils/vgafontedit/precomp.h
@@ -16,8 +16,21 @@
 #include "customwndclasses.h"
 
 #include "raw.h"
-#include "psf.h"
 #include "cpi.h"
+#include "psf.h"
+
+typedef enum
+{
+    RAW,
+    CPI,
+    PSF
+} VGAFONT_TYPE;
+
+typedef struct _VGAFONT
+{
+    VGAFONT_TYPE FontType;
+    PVOID        FontPtr;
+} VGAFONT, *PVGAFONT;
 
 // Forward declarations
 typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO;
diff --git a/rosapps/applications/devutils/vgafontedit/psf.h b/rosapps/applications/devutils/vgafontedit/psf.h
index f895f87bf2f..6338856b58c 100644
--- a/rosapps/applications/devutils/vgafontedit/psf.h
+++ b/rosapps/applications/devutils/vgafontedit/psf.h
@@ -9,8 +9,16 @@
 #ifndef __PSF_H
 #define __PSF_H
 
-#define PSF1_MAGIC0                   0x36
-#define PSF1_MAGIC1                   0x04
+#define PSF1_MAGIC0     0x36
+#define PSF1_MAGIC1     0x04
+
+#define PSF1_MODE512    0x01
+#define PSF1_MODEHASTAB 0x02
+#define PSF1_MODEHASSEQ 0x04
+#define PSF1_MAXMODE    0x05
+
+#define PSF1_SEPARATOR  0xFFFF
+#define PSF1_STARTSEQ   0xFFFE
 
 typedef struct _PSF1_HEADER
 {
diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
deleted file mode 100644
index 8395d68f57f..00000000000
--- a/rosapps/directory.rbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="applications">
-		<xi:include href="applications/applications.rbuild" />
-	</directory>
-
-	<directory name="demos">
-		<xi:include href="demos/directory.rbuild" />
-	</directory>
-
-	<directory name="drivers">
-		<xi:include href="drivers/directory.rbuild" />
-	</directory>
-	
-	<directory name="lib">
-		<xi:include href="lib/directory.rbuild" />
-	</directory>
-</group>