diff -r 7d48bed6ce0c -r 987c9837762f phoneclientserver/phoneclient/Group/PhoneClient.mmp
--- a/phoneclientserver/phoneclient/Group/PhoneClient.mmp	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/phoneclient/Group/PhoneClient.mmp	Wed Sep 01 12:15:03 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -28,94 +28,96 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x1000084F
 
-SOURCEPATH      ../src/notifier/notifier_aiw 
-SOURCE          cphcltcallnotify.cpp 
-SOURCE          rphcltcallnotify.cpp 
+SOURCEPATH      ../Src/Notifier/Notifier_Aiw
+SOURCE          CPhCltCallNotify.cpp 
+SOURCE          RPhCltCallNotify.cpp
 SOURCE          cphcltdialrequestmonitor.cpp
 SOURCE          cphcltdialemergencyrequestmonitor.cpp
 SOURCE          cphcltcomhandrequestmonitor.cpp
 
 
-SOURCEPATH      ../src/extcall/extcall_aiw 
-SOURCE          rphcltextcall.cpp 
-SOURCE          cphcltextphonedialdata.cpp 
+SOURCEPATH      ../Src/ExtCall/ExtCall_Aiw
+SOURCE          RPhCltExtCall.cpp
+SOURCE          CPhCltExtPhoneDialData.cpp
 SOURCE          cphcltdialdata.cpp
 
-SOURCEPATH      ../src/extcallwrapper/extcallwrapper_aiw 
-SOURCE          cphcltextphone.cpp 
-SOURCE          cphcltextphonebase.cpp 
+SOURCEPATH      ../Src/ExtCallWrapper/ExtCallWrapper_Aiw
+SOURCE          CPhCltExtPhone.cpp
+SOURCE          CPhCltExtPhoneBase.cpp
 
-SOURCEPATH      ../src/ussd/ussd_ext 
+SOURCEPATH      ../Src/Ussd/ussd_ext
 SOURCE          rphcltussd.cpp
 
-SOURCEPATH      ../src/ussdwrapper 
-SOURCE          cphcltussdrequesthandler.cpp 
+SOURCEPATH      ../Src/UssdWrapper
+SOURCE          CPhCltUssdRequestHandler.cpp
 
-SOURCE          cphcltussdsatclient.cpp 
+SOURCE          CPhCltUssdSatClient.cpp
   
-SOURCE          cphcltussdint.cpp 
-SOURCE          cphcltussdimp.cpp 
-SOURCE          cphcltussdext.cpp 
+SOURCE          CPhCltUssdInt.cpp
+SOURCE          CPhCltUssdImp.cpp
+SOURCE          CPhCltUssdExt.cpp
 
-SOURCE      cphcltussdnotecontroller.cpp 
+SOURCE		CPhCltUssdNoteController.cpp
 
-SOURCEPATH      ../src/emergencynumber/emergencynumber_aiw 
-SOURCE          cphcltemergencycall.cpp 
-SOURCE          rphcltemergencycall.cpp 
-SOURCE          cphcltemergencycallimpl.cpp 
+SOURCEPATH      ../Src/EmergencyNumber/EmergencyNumber_Aiw
+SOURCE          CPhCltEmergencyCall.cpp
+SOURCE          RPhCltEmergencyCall.cpp
+SOURCE          CPhCltEmergencyCallImpl.cpp
 
-SOURCEPATH      ../src/session 
-SOURCE          rphcltserver.cpp 
+SOURCEPATH      ../Src/Session
+SOURCE          RPhCltServer.cpp
 
-SOURCEPATH      ../src 
-SOURCE          phcltutils.cpp 
-SOURCE          rphcltresourcefile.cpp 
+SOURCEPATH      ../Src
+SOURCE          PhCltUtils.cpp
+SOURCE          RPhCltResourceFile.cpp
 
-SOURCEPATH      ../src/commandhandler 
-SOURCE          cphcltcommandhandler.cpp 
-SOURCE          cphcltcomhandimplementation.cpp 
-SOURCE          rphcltcommandhandler.cpp 
-SOURCEPATH      ../src/imagehandler 
-SOURCE          cphcltimagehandler.cpp 
-SOURCE          cphcltbaseimageparams.cpp 
-SOURCE          cphcltoperatorlogocontainer.cpp 
-SOURCE          cphcltimagehandlerimplementation.cpp 
-SOURCE          rphcltimagehandler.cpp 
-SOURCEPATH      ../src/messenger 
-SOURCE          cphcltmessenger.cpp 
-SOURCE          rphcltmessenger.cpp 
-SOURCE          cphcltmessengerimplementation.cpp 
+SOURCEPATH      ../Src/CommandHandler
+SOURCE          CPhCltCommandHandler.cpp
+SOURCE          CPhCltComHandImplementation.cpp
+SOURCE          RPhCltCommandHandler.cpp
+SOURCEPATH      ../Src/ImageHandler
+SOURCE          CPhCltImageHandler.cpp
+SOURCE          CPhCltBaseImageParams.cpp
+SOURCE          CPhCltOperatorLogoContainer.cpp
+SOURCE          CPhCltImageHandlerImplementation.cpp
+SOURCE          RPhCltImageHandler.cpp
+SOURCEPATH      ../Src/Messenger
+SOURCE          CPhCltMessenger.cpp
+SOURCE          RPhCltMessenger.cpp
+SOURCE          CPhCltMessengerImplementation.cpp
 
 
 
-SOURCEPATH      ../src 
+SOURCEPATH      ../Src
+START RESOURCE ../Data/PhoneClient.rss
+HEADER
+TARGETPATH   RESOURCE_FILES_DIR  
+LANGUAGE_IDS
+END  // RESOURCE
 
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   ../../../inc
-SYSTEMINCLUDE        /epoc32/include/mw/hb/hbwidgets
-SYSTEMINCLUDE        /epoc32/include/mw/hb/hbcore
-SYSTEMINCLUDE        /epoc32/include/platform/mw/loc
-SYSTEMINCLUDE        /epoc32/include/platform/mw/loc/sc
 
-USERINCLUDE     ../inc/extcall/extcall_aiw 
-USERINCLUDE     ../inc/notifier/notifier_aiw 
-USERINCLUDE     ../inc/extcallwrapper/extcallwrapper_aiw 
-USERINCLUDE     ../inc/emergencynumber/emergencynumber_aiw 
+USERINCLUDE     ../Inc/ExtCall/ExtCall_Aiw
+USERINCLUDE     ../Inc/Notifier/Notifier_Aiw
+USERINCLUDE     ../Inc/ExtCallWrapper/ExtCallWrapper_Aiw
+USERINCLUDE     ../Inc/EmergencyNumber/EmergencyNumber_Aiw
 
-USERINCLUDE     ../inc/session 
-USERINCLUDE     ../inc/sharedclientserver 
+USERINCLUDE     ../Inc/Session
+USERINCLUDE     ../Inc/SharedClientServer
 
-USERINCLUDE     ../inc/ussdwrapper/ussd_ext 
-USERINCLUDE     ../inc/ussd/ussd_ext 
-USERINCLUDE     ../inc/commandhandler 
-USERINCLUDE     ../inc/imagehandler 
-USERINCLUDE     ../inc/messenger 
-USERINCLUDE     ../inc/ussdwrapper 
-USERINCLUDE     ../inc 
+USERINCLUDE     ../Inc/UssdWrapper/Ussd_Ext
+USERINCLUDE     ../Inc/Ussd/ussd_ext
+USERINCLUDE     ../Inc/CommandHandler
+USERINCLUDE     ../Inc/ImageHandler
+USERINCLUDE     ../Inc/Messenger
+USERINCLUDE     ../Inc/UssdWrapper
+USERINCLUDE     ../Inc 
 
 
 LIBRARY         euser.lib
 LIBRARY         aknnotify.lib
+LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         estor.lib
 LIBRARY         commonengine.lib 
@@ -126,15 +128,12 @@
 LIBRARY         efsrv.lib
 LIBRARY         charconv.lib
 LIBRARY         fbscli.lib
-LIBRARY         hbwidgets.lib
-LIBRARY         flogger.lib
-LIBRARY         hbcore.lib
 
 
 #ifdef WINSCW
-    DEFFILE ../bwins/phoneclient_aiwext.def
+    DEFFILE ../Bwins/PHONECLIENT_AiwExt.DEF
 #else
-    DEFFILE ../eabi/phoneclient_aiwext.def
+    DEFFILE ../EABI/PHONECLIENT_AiwExt.DEF
 #endif
 
 // End of File