diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/tef/ChildI_Main.cpp
--- a/localisation/apparchitecture/tef/ChildI_Main.cpp	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/tef/ChildI_Main.cpp	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -15,8 +15,6 @@
 // 
 //
 
-
-
 /**
  @file
  @internalComponent - Internal Symbian test code
@@ -28,20 +26,20 @@
 #include <eikappui.h>
 #include <eikapp.h>
 #include <eikdoc.h>
-#include <eikmenup.h>
+#include <mw/eikmenup.h>
 #include <eikstart.h>
 
-#include <eikon.hrh>
+#include <mw/eikon.hrh>
 //#include <apparctestserver.h>
 
-#include <ChildI.rsg>
+#include <childi.rsg>
 #include "ChildI.hrh"
 //#include "T_ProcStep.h"
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleAppView
 //
-////////////////////////////////////////////////////////////////////////
+//
 class CExampleAppView : public CCoeControl
     {
 public:
@@ -143,11 +141,11 @@
 	gc.DiscardFont();
 	}
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleAppUi
 //
-////////////////////////////////////////////////////////////////////////
+//
 class CExampleAppUi : public CEikAppUi
     {
 public:
@@ -223,11 +221,11 @@
 		}
 	}
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleDocument
 //
-////////////////////////////////////////////////////////////////////////
+//
 
 class CExampleDocument : public CEikDocument
 	{
@@ -259,11 +257,11 @@
     return new(ELeave) CExampleAppUi;
 	}
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleApplication
 //
-////////////////////////////////////////////////////////////////////////
+//
 
 //             The entry point for the application code. It creates
 //             an instance of the CApaApplication derived