diff --git a/.gitignore b/.gitignore
index b5581b3..83b3f0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,4 @@ hidtopad.cscope_file_list
 hidtopad.cbp
 hidtopad.layout
 hidtopad.cbp
-hidtovpad.mod
+hidtovpad.wps
diff --git a/Makefile b/Makefile
index 08fb63f..e9e8cec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,300 +1,148 @@
-# You probably never need to adjust this Makefile.
-# All changes can be done in the makefile.mk
-
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 .SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
+#-------------------------------------------------------------------------------
+
 ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
 endif
 
-export PATH		:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
-export PORTLIBS :=	$(DEVKITPRO)/portlibs/ppc
-export WUPSDIR  :=  $(DEVKITPRO)/wups
-export GCC_VER  :=  $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)
+TOPDIR ?= $(CURDIR)
 
-PREFIX	:=	powerpc-eabi-
+include $(DEVKITPRO)/wups/share/wups_rules
 
-export AS		:=	$(PREFIX)as
-export CC		:=	$(PREFIX)gcc
-export CXX		:=	$(PREFIX)g++
-export LD		:=	$(PREFIX)ld
-export AR		:=	$(PREFIX)ar
-export OBJCOPY	:=	$(PREFIX)objcopy
+WUT_ROOT := $(DEVKITPRO)/wut
+WUMS_ROOT := $(DEVKITPRO)/wums
 
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # TARGET is the name of the output
 # BUILD is the directory where object files & intermediate files will be placed
 # SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:= 	build
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#-------------------------------------------------------------------------------
+TARGET		:=	hidtovpad
+BUILD		:=	build
+SOURCES		:=	src \
+				src/utils
+DATA		:=	data
+INCLUDES	:=	src
 
-ifeq ($(notdir $(CURDIR)),$(BUILD))
-    include ../makefile.mk
-else
-    include makefile.mk
-endif
-
-include $(WUPSDIR)/plugin_makefile.mk
-
-
-#MAP ?= $(TARGET:.mod=.map)
-
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # options for code generation
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+			$(MACHDEP)
 
-# -Os: optimise size
-# -Wall: generate lots of warnings
-# -D__wiiu__: define the symbol __wiiu__ (used in some headers)
-# -mcpu=750: enable processor specific compilation
-# -meabi: enable eabi specific compilation
-# -mhard-float: enable hardware floating point instructions
-# -nostartfiles: Do not use the standard system startup files when linking
-# -ffunction-sections: split up functions so linker can garbage collect
-# -fdata-sections: split up data so linker can garbage collect
-COMMON_CFLAGS	:= -Os -Wall -mcpu=750 -meabi -mhard-float  -D__WIIU__ -nostartfiles -ffunction-sections -fdata-sections -Wl,-q  $(COMMON_CFLAGS)
+CFLAGS	+=	$(INCLUDE) -D__WIIU__ -D__WUT__ -D__WUPS__ -D__LOGGING__
 
-# -x c: compile as c code
-# -std=c11: use the c11 standard
-CFLAGS	  		:= $(COMMON_CFLAGS) -x c -std=gnu11 $(CFLAGS)
+CXXFLAGS	:= $(CFLAGS)
 
-# -x c: compile as c++ code
-# -std=gnu++11: use the c++11 standard
-CXXFLAGS  		:= $(COMMON_CFLAGS) -x c++ -std=gnu++11 $(CXXFLAGS)
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) -T$(WUMS_ROOT)/share/libmappedmemory.ld $(WUPSSPECS)
 
-ifeq ($(DO_LOGGING), 1)
-   CFLAGS += -D__LOGGING__
-   CXXFLAGS += -D__LOGGING__
-endif
+LIBS	:= -lcontrollerpatcher -lwups -lwut -lmappedmemory
 
-#---------------------------------------------------------------------------------
-# any extra ld flags
-#--------------------------------------------------------------------------------
-# --gc-sections: remove unneeded symbols
-# -Map: generate a map file
-LDFLAGS +=  -Wl,-Map,$(notdir $@).map,--gc-sections
+#-------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level
+# containing include and lib
+#-------------------------------------------------------------------------------
+LIBDIRS	:= $(PORTLIBS) $(WUPS_ROOT) $(WUT_ROOT) $(WUT_ROOT)/usr $(WUMS_ROOT)
 
-
-#---------------------------------------------------------------------------------
-Q := @
-MAKEFLAGS += --no-print-directory
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS    +=
-#  
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	+=
-
-NEEDS_WUT := 0
-                    
-ifeq ($(WUT_ENABLE_CPP), 1)
-    WUT_ENABLE_NEWLIB    := 1
-       
-    LDFLAGS              += -Wl,-whole-archive,-lwutstdc++,-no-whole-archive
-    NEEDS_WUT            := 1
-endif
-
-ifeq ($(WUT_ENABLE_NEWLIB), 1)     
-    LDFLAGS              += -Wl,-whole-archive,-lwutnewlib,-no-whole-archive
-    NEEDS_WUT            := 1
-endif
-
-ifeq ($(WUT_DEFAULT_MALLOC), 1)       
-    LDFLAGS              += -Wl,-whole-archive,-lwutmalloc,-no-whole-archive
-    NEEDS_WUT            := 1
-endif
-
-ifeq ($(NEEDS_WUT), 1)       
-    ifeq ($(strip $(WUT_ROOT)),)
-        $(error "Please set WUT_ROOT in your environment. export WUT_ROOT=<path to>wut)
-    endif
-    CFLAGS += -D__WUT__
-    CXXFLAGS += -D__WUT__
-endif
-
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
 # rules for different file extensions
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-export PROJECTDIR := $(CURDIR)
-export OUTPUT	:=	$(CURDIR)/$(TARGETDIR)/$(TARGET)
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-TTFFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.ttf)))
-PNGFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.png)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export REAL_LD	:=	$(CC)
-else
-	export REAL_LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o) \
-					$(PNGFILES:.png=.png.o) $(addsuffix .o,$(BINFILES))
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE_FULL	+=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-                        $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-                        $(EXTERNAL_INCLUDE)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS_FULL +=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-                        $(EXTERNAL_LIBPATHS)
-                    
+#-------------------------------------------------------------------------------
 
 export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean install
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#-------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#-------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#-------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#-------------------------------------------------------------------------------
+else
+#-------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#-------------------------------------------------------------------------------
+endif
+#-------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) clean all
+
+#-------------------------------------------------------------------------------
+all: $(BUILD)
 
-#---------------------------------------------------------------------------------
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-	
-#---------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).mod $(OUTPUT)
+	@rm -fr $(BUILD) $(TARGET).wps $(TARGET).elf
 
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 else
+.PHONY:	all
 
 DEPENDS	:=	$(OFILES:.o=.d)
 
-THIS_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+#-------------------------------------------------------------------------------
+# main targets
+#-------------------------------------------------------------------------------
+all	:	$(OUTPUT).wps
 
-###############################################################################
-# Rule to make everything.
-PHONY += all
+$(OUTPUT).wps	:	$(OUTPUT).elf
+$(OUTPUT).elf	:	$(OFILES)
 
-all : $(OUTPUT)
-###############################################################################
-# Special build rules
+$(OFILES_SRC)	: $(HFILES_BIN)
 
-
-# Rule to make the module file.
-$(OUTPUT) : $(OFILES)
-	@echo "linking ... " $@
-	@$(REAL_LD) $(OFILES) $(LDFLAGS) $(LIBS) $(LIBPATHS_FULL) -o $@
-  
-###############################################################################
-# Standard build rules
-#---------------------------------------------------------------------------------
-%.a:
-#---------------------------------------------------------------------------------
-	@echo $(notdir $@)
-	@rm -f $@
-	@$(AR) -rc $@ $^
-
-#---------------------------------------------------------------------------------
-%.o: %.cpp
+#-------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#-------------------------------------------------------------------------------
+%.bin.o	%_bin.h :	%.bin
+#-------------------------------------------------------------------------------
 	@echo $(notdir $<)
-	@$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.d $(CXXFLAGS) $(INCLUDE_FULL)  -c $< -o $@ $(ERROR_FILTER)
+	@$(bin2o)
 
 #---------------------------------------------------------------------------------
-%.o: %.c
-	@echo $(notdir $<)
-	@$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) $(INCLUDE_FULL)  -c $< -o $@ $(ERROR_FILTER)
-
-#---------------------------------------------------------------------------------
-%.o: %.S
-	@echo $(notdir $<)
-	$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(INCLUDE_FULL) -c $< -o $@ $(ERROR_FILTER)
-
-#---------------------------------------------------------------------------------
-%.png.o : %.png
+%.tga.o	%_tga.h  : %.tga
 	@echo $(notdir $<)
 	@bin2s -a 32 $< | $(AS) -o $(@)
-
 #---------------------------------------------------------------------------------
-%.jpg.o : %.jpg
+%.h264.o	%_h264.h  : %.h264
 	@echo $(notdir $<)
 	@bin2s -a 32 $< | $(AS) -o $(@)
-
 #---------------------------------------------------------------------------------
-%.ttf.o : %.ttf
-	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
 
-#---------------------------------------------------------------------------------
-%.bin.o : %.bin
-	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
-
-#---------------------------------------------------------------------------------
-%.wav.o : %.wav
-	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
-
-#---------------------------------------------------------------------------------
-%.mp3.o : %.mp3
-	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
-
-#---------------------------------------------------------------------------------
-%.ogg.o : %.ogg
-	@echo $(notdir $<)
-	@bin2s -a 32 $< | $(AS) -o $(@)
-
-###############################################################################
-# Assembly listing rules
-
-# Rule to make assembly listing.
-PHONY += list
-list  : $(LIST)
-
-# Rule to make the listing file.
-%.list : $(TARGET)
-	$(LOG)
-	-$Qmkdir -p $(dir $@)
-	$Q$(OBJDUMP) -d $< > $@
-
-###############################################################################
-# Clean rule
-
-# Rule to clean files.
-PHONY += clean
-clean : 
-	$Qrm -rf $(wildcard $(BUILD) $(BIN))
-
-###############################################################################
-# Phony targets
-
-.PHONY : $(PHONY)
-  
 -include $(DEPENDS)
 
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 endif
-#---------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/makefile.mk b/makefile.mk
deleted file mode 100644
index e8e517f..0000000
--- a/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-# Compiling the projects with libutils logging code?
-DO_LOGGING          := 1
-
-# Links against the wut implementation of newlib, this is useful for using any function
-# from the C standard library
-WUT_ENABLE_NEWLIB   := 0
-
-# Links against the wut implementation of stdcpp, this is useful for using any function
-# from the C++ standard library. This will enable WUT_ENABLE_NEWLIB if you have not already done so.
-WUT_ENABLE_CPP      := 0
-
-# By default newlib will allocate 90% of the default heap for use with sbrk & malloc, 
-# if this is unacceptable to you then you should use this as it replaces the newlib 
-# malloc functions which ones which redirect to the CafeOS default heap functions 
-# such as MEMAllocFromDefaultHeap.
-WUT_DEFAULT_MALLOC  := 1
-
-# Target filename
-TARGET              := hidtovpad.mod
-
-# Source directories
-SOURCES             := src
-
-# Data directories
-DATA                :=	
-
-# Include directories
-INCLUDES            := src
-
-#---------------------------------------------------------------------------------
-# options for code generation and linking
-#---------------------------------------------------------------------------------
-# Extra C AND C++ compiler flags
-COMMON_CFLAGS       := 
-# Extra C compiler flags
-CFLAGS              :=
-# Extra C++ compiler flags
-CXXFLAGS            :=
-# Extra linking flags for all linking steps
-LDFLAGS             := 
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS             := $(WUPSDIR) $(WUT_ROOT)
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS                := -lwups -lcontrollerpatcherwut -lutilswut  -lcoreinit -lnsysnet -lnsyshid -lvpadbase -lvpad -lpadscore
-
-#---------------------------------------------------------------------------------
-# Will be added to the final lib paths
-# example: 
-# -L$C:/library1/lib
-#---------------------------------------------------------------------------------
-EXTERNAL_LIBPATHS   := 
-                        
-#---------------------------------------------------------------------------------
-# Will be added to the final include paths
-# -IC:/library1/include
-#---------------------------------------------------------------------------------
-EXTERNAL_INCLUDE    := -I$(WUT_ROOT)/include/libutilswut
diff --git a/src/main.cpp b/src/main.cpp
index e05162e..9edd420 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,7 +31,7 @@ WUPS_PLUGIN_AUTHOR("Maschell");
 WUPS_PLUGIN_LICENSE("GPL");
 
 // We want access to the SDCard!
-WUPS_FS_ACCESS()
+WUPS_USE_WUT_CRT()
 
 #define SD_PATH                     "sd:"
 #define WIIU_PATH                   "/wiiu"
@@ -55,7 +55,7 @@ DEINITIALIZE_PLUGIN() {
     ControllerPatcher::stopNetworkServer();
 }
 
-ON_APPLICATION_ENDING() {
+ON_APPLICATION_END() {
     //CursorDrawer::destroyInstance();
     DEBUG_FUNCTION_LINE("ON_APPLICATION_ENDING\n");
     ControllerPatcher::destroyConfigHelper();
diff --git a/src/utils/StringTools.cpp b/src/utils/StringTools.cpp
new file mode 100644
index 0000000..23b87fa
--- /dev/null
+++ b/src/utils/StringTools.cpp
@@ -0,0 +1,210 @@
+/***************************************************************************
+ * Copyright (C) 2010
+ * by Dimok
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any
+ * damages arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any
+ * purpose, including commercial applications, and to alter it and
+ * redistribute it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you
+ * must not claim that you wrote the original software. If you use
+ * this software in a product, an acknowledgment in the product
+ * documentation would be appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and
+ * must not be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+ *
+ * for WiiXplorer 2010
+ ***************************************************************************/
+#include <vector>
+#include <string>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <strings.h>
+#include <wut_types.h>
+#include <stdio.h>
+#include <utils/StringTools.h>
+
+
+BOOL StringTools::EndsWith(const std::string& a, const std::string& b) {
+    if (b.size() > a.size()) return false;
+    return std::equal(a.begin() + a.size() - b.size(), a.end(), b.begin());
+}
+
+const char * StringTools::byte_to_binary(int32_t x) {
+    static char b[9];
+    b[0] = '\0';
+
+    int32_t z;
+    for (z = 128; z > 0; z >>= 1) {
+        strcat(b, ((x & z) == z) ? "1" : "0");
+    }
+
+    return b;
+}
+
+std::string StringTools::removeCharFromString(std::string& input,char toBeRemoved) {
+    std::string output = input;
+    size_t position;
+    while(1) {
+        position = output.find(toBeRemoved);
+        if(position == std::string::npos)
+            break;
+        output.erase(position, 1);
+    }
+    return output;
+}
+
+const char * StringTools::fmt(const char * format, ...) {
+    static char strChar[512];
+    strChar[0] = 0;
+
+    va_list va;
+    va_start(va, format);
+    if((vsprintf(strChar, format, va) >= 0)) {
+        va_end(va);
+        return (const char *) strChar;
+    }
+    va_end(va);
+
+    return NULL;
+}
+
+const wchar_t * StringTools::wfmt(const char * format, ...) {
+    static char tmp[512];
+    static wchar_t strWChar[512];
+    strWChar[0] = 0;
+    tmp[0] = 0;
+
+    if(!format)
+        return (const wchar_t *) strWChar;
+
+    if(strcmp(format, "") == 0)
+        return (const wchar_t *) strWChar;
+
+    va_list va;
+    va_start(va, format);
+    if((vsprintf(tmp, format, va) >= 0)) {
+        int	bt;
+        int32_t strlength = strlen(tmp);
+        bt = mbstowcs(strWChar, tmp, (strlength < 512) ? strlength : 512 );
+
+        if(bt > 0) {
+            strWChar[bt] = 0;
+            return (const wchar_t *) strWChar;
+        }
+    }
+    va_end(va);
+
+    return NULL;
+}
+
+int32_t StringTools::strprintf(std::string &str, const char * format, ...) {
+    static char tmp[512];
+    tmp[0] = 0;
+    int32_t result = 0;
+
+    va_list va;
+    va_start(va, format);
+    if((vsprintf(tmp, format, va) >= 0)) {
+        str = tmp;
+        result = str.size();
+    }
+    va_end(va);
+
+    return result;
+}
+
+std::string StringTools::strfmt(const char * format, ...) {
+    std::string str;
+    static char tmp[512];
+    tmp[0] = 0;
+
+    va_list va;
+    va_start(va, format);
+    if((vsprintf(tmp, format, va) >= 0)) {
+        str = tmp;
+    }
+    va_end(va);
+
+    return str;
+}
+
+BOOL StringTools::char2wchar_t(const char * strChar, wchar_t * dest) {
+    if(!strChar || !dest)
+        return false;
+
+    int	bt;
+    bt = mbstowcs(dest, strChar, strlen(strChar));
+    if (bt > 0) {
+        dest[bt] = 0;
+        return true;
+    }
+
+    return false;
+}
+
+int32_t StringTools::strtokcmp(const char * string, const char * compare, const char * separator) {
+    if(!string || !compare)
+        return -1;
+
+    char TokCopy[512];
+    strncpy(TokCopy, compare, sizeof(TokCopy));
+    TokCopy[511] = '\0';
+
+    char * strTok = strtok(TokCopy, separator);
+
+    while (strTok != NULL) {
+        if (strcasecmp(string, strTok) == 0) {
+            return 0;
+        }
+        strTok = strtok(NULL,separator);
+    }
+
+    return -1;
+}
+
+int32_t StringTools::strextcmp(const char * string, const char * extension, char seperator) {
+    if(!string || !extension)
+        return -1;
+
+    char *ptr = strrchr(string, seperator);
+    if(!ptr)
+        return -1;
+
+    return strcasecmp(ptr + 1, extension);
+}
+
+
+std::vector<std::string> StringTools::stringSplit(const std::string & inValue, const std::string & splitter) {
+    std::string value = inValue;
+    std::vector<std::string> result;
+    while (true) {
+        uint32_t index = value.find(splitter);
+        if (index == std::string::npos) {
+            result.push_back(value);
+            break;
+        }
+        std::string first = value.substr(0, index);
+        result.push_back(first);
+        if (index + splitter.size() == value.length()) {
+            result.push_back("");
+            break;
+        }
+        if(index + splitter.size() > value.length()) {
+            break;
+        }
+        value = value.substr(index + splitter.size(), value.length());
+    }
+    return result;
+}
\ No newline at end of file
diff --git a/src/utils/StringTools.h b/src/utils/StringTools.h
new file mode 100644
index 0000000..e7c8527
--- /dev/null
+++ b/src/utils/StringTools.h
@@ -0,0 +1,81 @@
+/***************************************************************************
+ * Copyright (C) 2010
+ * by Dimok
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any
+ * damages arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any
+ * purpose, including commercial applications, and to alter it and
+ * redistribute it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you
+ * must not claim that you wrote the original software. If you use
+ * this software in a product, an acknowledgment in the product
+ * documentation would be appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and
+ * must not be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+ *
+ * for WiiXplorer 2010
+ ***************************************************************************/
+#ifndef __STRING_TOOLS_H
+#define __STRING_TOOLS_H
+
+#include <vector>
+#include <string>
+#include <wut_types.h>
+
+class StringTools{
+    public:
+        static BOOL EndsWith(const std::string& a, const std::string& b);
+        static const char * byte_to_binary(int32_t x);
+        static std::string removeCharFromString(std::string& input,char toBeRemoved);
+        static const char * fmt(const char * format, ...);
+        static const wchar_t * wfmt(const char * format, ...);
+        static int32_t strprintf(std::string &str, const char * format, ...);
+        static std::string strfmt(const char * format, ...);
+        static BOOL char2wchar_t(const char * src, wchar_t * dest);
+        static int32_t strtokcmp(const char * string, const char * compare, const char * separator);
+        static int32_t strextcmp(const char * string, const char * extension, char seperator);
+
+        static const char * FullpathToFilename(const char *path){
+            if(!path) return path;
+
+            const char * ptr = path;
+            const char * Filename = ptr;
+
+            while(*ptr != '\0')
+            {
+                if(ptr[0] == '/' && ptr[1] != '\0')
+                    Filename = ptr+1;
+
+                ++ptr;
+            }
+
+            return Filename;
+        }
+
+        static void RemoveDoubleSlashs(std::string &str){
+            uint32_t length = str.size();
+
+            //! clear path of double slashes
+            for(uint32_t i = 1; i < length; ++i)
+            {
+                if(str[i-1] == '/' && str[i] == '/')
+                {
+                    str.erase(i, 1);
+                    i--;
+                    length--;
+                }
+            }
+        }
+
+        static std::vector<std::string> stringSplit(const std::string & value, const std::string & splitter);
+};
+
+#endif /* __STRING_TOOLS_H */
diff --git a/src/utils/logger.h b/src/utils/logger.h
new file mode 100644
index 0000000..f921c90
--- /dev/null
+++ b/src/utils/logger.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <cstring>
+#include <whb/log.h>
+#include <whb/log_udp.h>
+
+#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
+#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
+
+#ifdef __LOGGING__
+
+#define log_init() WHBLogUdpInit()
+#define log_print(str) WHBLogPrint(str)
+#define log_printf(FMT, ARGS...)  WHBLogPrintf(FMT, ## ARGS);
+
+#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
+    WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
+    } while (0);
+
+#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \
+    WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
+    } while (0);
+
+#else
+
+#define log_init()
+#define log_print(str)
+#define log_printf(FMT, ARGS...)
+#define DEBUG_FUNCTION_LINE(FMT, ARGS...)
+#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file