diff --git a/README.txt b/README.txt
index 8a4e12d..c0b310f 100644
--- a/README.txt
+++ b/README.txt
@@ -24,3 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 -------------------------------------------------------------------------
+CHANGES from version 0.1:
+-------------------------------------------------------------------------
+* Bug-fixes
+* Service and Client added
\ No newline at end of file
diff --git a/src/test/main_codec.c b/src/test/main_codec.c
index 01b0481..f4cf402 100644
--- a/src/test/main_codec.c
+++ b/src/test/main_codec.c
@@ -18,7 +18,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.1
+ * @version 0.2
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Sample program to illustrate how to read an EXI stream and
@@ -43,7 +43,7 @@
 uint8_t data[ARRAY_SIZE_BYTES];
 uint32_t codepoints[ARRAY_SIZE_STRINGS];
 
-int mainX(int argc, char *argv[]) {
+int main_codec(int argc, char *argv[]) {
 
 	int errn = 0;
 	unsigned int i;
diff --git a/src/test/main_service.c b/src/test/main_service.c
index 5847d06..16a9f05 100644
--- a/src/test/main_service.c
+++ b/src/test/main_service.c
@@ -25,11 +25,11 @@
 
 
 
-#include "service/v2g_service.h"
-#include "service/v2g_serviceDataTypes.h"
-#include "service/v2g_serviceClientStubs.h"
-#include "codec/EXITypes.h"
-#include "codec/BitStream.h"
+#include "v2g_service.h"
+#include "v2g_serviceDataTypes.h"
+#include "v2g_serviceClientStubs.h"
+#include "EXITypes.h"
+#include "BitStream.h"
 
 #include <stdlib.h>
 
diff --git a/src/test/v2g_server.c b/src/test/v2g_server.c
index eace6cf..0040354 100644
--- a/src/test/v2g_server.c
+++ b/src/test/v2g_server.c
@@ -24,8 +24,8 @@
  ********************************************************************/
 
 #include "v2g_server.h"
-#include "service/v2g_service.h"
-#include "service/v2g_serviceDispatcher.h"
+#include "v2g_service.h"
+#include "v2g_serviceDispatcher.h"
 
 #define MAX_BYTE_SIZE 128
 #define MAX_STRING_SIZE 256
diff --git a/src/test/v2g_server.h b/src/test/v2g_server.h
index 15546fb..9ea9cf7 100644
--- a/src/test/v2g_server.h
+++ b/src/test/v2g_server.h
@@ -25,7 +25,7 @@
 #ifndef V2G_SERVER_H_
 #define V2G_SERVER_H_
 
-#include "codec/EXITypes.h"
+#include "EXITypes.h"
 
 int testV2GService(uint8_t* inStream, size_t inStreamLength, uint8_t* outStream);
 
diff --git a/src/test/v2g_serviceClientDataTransmitter.c b/src/test/v2g_serviceClientDataTransmitter.c
index 000bbcc..64eca01 100644
--- a/src/test/v2g_serviceClientDataTransmitter.c
+++ b/src/test/v2g_serviceClientDataTransmitter.c
@@ -23,9 +23,9 @@
  *
  ********************************************************************/
 
-#include "service/v2g_serviceClientDataTransmitter.h"
+#include "v2g_serviceClientDataTransmitter.h"
 #include "v2g_server.h"
-#include "codec/Bitstream.h"
+#include "Bitstream.h"
 
 /* This method has to be implemented!
  * Send EXI stream (outStream) to EVSE and receive response stream (inStream)*/
diff --git a/src/test/v2g_serviceMethods.c b/src/test/v2g_serviceMethods.c
index 068505d..9155087 100644
--- a/src/test/v2g_serviceMethods.c
+++ b/src/test/v2g_serviceMethods.c
@@ -23,8 +23,8 @@
  *
  ********************************************************************/
 
-#include "service/v2g_serviceMethods.h"
-#include "service/v2g_serviceDataTypes.h"
+#include "v2g_serviceMethods.h"
+#include "v2g_serviceDataTypes.h"
 #include <stdio.h>
 
 int	sessionSetup(struct SessionSetupReqType* param, struct SessionSetupResType* result)