diff -r 7d48bed6ce0c -r 987c9837762f phoneclientserver/phoneserver/Group/PhoneServer.mmp
--- a/phoneclientserver/phoneserver/Group/PhoneServer.mmp	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/phoneserver/Group/PhoneServer.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-2005 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"
@@ -25,7 +25,7 @@
 VENDORID VID_DEFAULT
 
 TARGET          phoneserver.exe
-EPOCSTACKSIZE   0x5000
+EPOCSTACKSIZE	0x5000
 
 TARGETPATH      /system/programs
 TARGETTYPE      EXE
@@ -33,99 +33,87 @@
 UID             0x1000008d 0x10000850
 
 SOURCEPATH     .
-START RESOURCE ../src/resources/phoneserver.rss 
+START RESOURCE ../Src/Resources/PhoneServer.rss
 HEADER
 TARGETPATH   RESOURCE_FILES_DIR
 LANGUAGE_IDS
 END  // RESOURCE
 
-SOURCEPATH      ../src/standard 
-SOURCE          phsrvstartup.cpp 
-SOURCE          phsrvsubsessionfactory.cpp 
-SOURCE          phsrvutils.cpp 
+SOURCEPATH      ../Src/Standard
+SOURCE          PhSrvStartUp.cpp
+SOURCE          PhSrvSubSessionFactory.cpp
+SOURCE          PhSrvUtils.cpp
 
-SOURCE          cphsrvscheduler.cpp 
-SOURCE          cphsrvserver.cpp 
-SOURCE          cphsrvsession.cpp 
-SOURCE          cphsrvresourcemanager.cpp 
-SOURCE          cphsrvphonecontroller.cpp 
-SOURCE          cphsrvemergencynumbermanager.cpp 
+SOURCE          CPhSrvScheduler.cpp
+SOURCE          CPhSrvServer.cpp
+SOURCE          CPhSrvSession.cpp
+SOURCE          CPhSrvResourceManager.cpp
+SOURCE          CPhSrvPhoneController.cpp
+SOURCE          CPhSrvEmergencyNumberManager.cpp
 
-SOURCE          cphsrvsubsessionbase.cpp 
-SOURCE          cphsrvsubsessionussd.cpp 
+SOURCE          CPhSrvSubSessionBase.cpp
+SOURCE          CPhSrvSubSessionUssd.cpp
 
-SOURCE          phsrvdebuginfo.cpp 
+SOURCE          PhSrvDebugInfo.cpp
 
-SOURCEPATH  ../src/standard/standard_aiw 
-SOURCE          cphcltextphonedialdata.cpp 
+SOURCEPATH	../Src/Standard/Standard_Aiw
+SOURCE			CPhCltExtPhoneDialData.cpp
 SOURCE          cphcltdialdata.cpp
-SOURCE          cphsrvemergencyrequestmanager.cpp 
-SOURCE          cphsrvcallrequest.cpp 
-SOURCE          cphsrvcallrequestmanager.cpp 
-SOURCE          cphsrvsubsessionnotifier.cpp 
-SOURCE          cphsrvsubsessionextcall.cpp 
-SOURCE          cphsrvsubsessionemergencynum.cpp 
+SOURCE          CPhSrvEmergencyRequestManager.cpp
+SOURCE          CPhSrvCallRequest.cpp
+SOURCE          CPhSrvCallRequestManager.cpp
+SOURCE          CPhSrvSubSessionNotifier.cpp
+SOURCE          CPhSrvSubSessionExtCall.cpp
+SOURCE          CPhSrvSubSessionEmergencyNum.cpp
 
-SOURCEPATH  ../src/imagehandler 
-SOURCE      cphsrvsubsessionimagehandler.cpp 
-SOURCE      cphsrvimagesaver.cpp
+SOURCEPATH	../Src/ImageHandler
+SOURCE		CPhSrvSubSessionImageHandler.cpp
+SOURCE		cphsrvimagesaver.cpp
 
-SOURCEPATH      ../src/ussd 
-SOURCE          cphsrvussdreplytimer.cpp 
-SOURCE          cphsrvussdsendhandler.cpp 
-SOURCE          cphsrvussdreceivehandler.cpp 
-SOURCE          cphsrvussdmanager.cpp 
-SOURCE      cphsrvussdnotifynwrelease.cpp 
+SOURCEPATH      ../Src/Ussd
+SOURCE          CPhSrvUssdReplyTimer.cpp
+SOURCE          CPhSrvUssdSendHandler.cpp
+SOURCE          CPhSrvUssdReceiveHandler.cpp
+SOURCE          CPhSrvUssdManager.cpp
+SOURCE 		CPhSrvUssdNotifyNWRelease.cpp
 
-SOURCEPATH      ../src/commandhandler 
+SOURCEPATH      ../Src/CommandHandler
 #if defined( __AT_HANDLER )
-SOURCE          cphsrvsubsessioncommandhandler.cpp 
-SOURCE          cphsrvcomhandrequest.cpp 
+SOURCE          CPhSrvSubSessionCommandHandler.cpp
+SOURCE          CPhSrvComHandRequest.cpp
 #else  // No __AT_HANDLER defined, so stub version is used.
-SOURCE          cphsrvsubsessioncommandhandlerstub.cpp 
-SOURCE          cphsrvsubsessioncommandhandlernotifystub.cpp 
+SOURCE          CPhSrvSubSessionCommandHandlerStub.cpp
+SOURCE          CPhSrvSubSessionCommandHandlerNotifyStub.cpp
 #endif // __AT_HANDLER
 
-SOURCEPATH      ../src/commandhandler/commandhandler_aiw 
+SOURCEPATH      ../Src/CommandHandler/Commandhandler_Aiw
 
 #if defined( __AT_HANDLER )
-SOURCE          cphsrvcomhandrequestmanager.cpp 
+SOURCE          CPhSrvComHandRequestManager.cpp
 #else  // No __AT_HANDLER defined, so stub version is used.
-SOURCE          cphsrvcomhandrequestmanagerstub.cpp 
+SOURCE          CPhSrvComHandRequestManagerStub.cpp
 #endif // __AT_HANDLER
 
-SOURCEPATH      ../src/messenger 
-#if defined( __CS_VIDEO_TELEPHONY )
-SOURCE          cphsrvmessengerobject.cpp 
-SOURCE          cphsrvmessengerrequestmanager.cpp 
-SOURCE          cphsrvsubsessionmessenger.cpp 
-#else  // No __CS_VIDEO_TELEPHONY defined, so stub version is used.
-SOURCE          cphsrvmessengerrequestmanagerstub.cpp 
-SOURCE          cphsrvsubsessionmessengerstub.cpp 
-#endif // __CS_VIDEO_TELEPHONY
+SOURCEPATH      ../Src/Messenger
+SOURCE          CPhSrvMessengerObject.cpp
+SOURCE          CPhSrvMessengerRequestManager.cpp
+SOURCE          CPhSrvSubSessionMessenger.cpp
 
-USERINCLUDE     ../inc/standard 
-USERINCLUDE     ../inc/standard/standard_aiw 
-USERINCLUDE     ../inc/ussd 
-USERINCLUDE     ../inc/commandhandler 
-USERINCLUDE     ../inc/messenger 
-USERINCLUDE     ../inc/imagehandler 
+USERINCLUDE     ../Inc/Standard
+USERINCLUDE     ../Inc/Standard/Standard_Aiw
+USERINCLUDE     ../Inc/Ussd
+USERINCLUDE     ../Inc/CommandHandler
+USERINCLUDE     ../Inc/Messenger
+USERINCLUDE     ../Inc/ImageHandler
 
-USERINCLUDE     ../../phoneclient/inc/sharedclientserver 
+USERINCLUDE     ../../phoneclient/Inc/SharedClientServer
 
-// <-- QT PHONE START-->
-MW_LAYER_SYSTEMINCLUDE
-// <-- QT PHONE END-->
-
+APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   ../../../inc
 SYSTEMINCLUDE    ../../inc // for RPhCltEmergencyCall.h, CPhCltExtPhoneDialData.h
 
 // TEMPORARY DEFINITION FOR TELEPHONY VARIATION HEADERS
-SYSTEMINCLUDE   ../../../../../app/phone/inc
-
-// TEMPORARY DEFINITION FOR Orbit Device Dialog
-SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
-SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore
+SYSTEMINCLUDE	../../../../../app/phone/inc
 
 LIBRARY        efsrv.lib
 LIBRARY        apgrfx.lib
@@ -134,18 +122,19 @@
 LIBRARY        ws32.lib
 LIBRARY        etel.lib
 LIBRARY        bafl.lib
+LIBRARY        aknnotify.lib
 LIBRARY        gsmu.lib
+LIBRARY        avkon.lib
 LIBRARY        apparc.lib
 LIBRARY        customapi.lib
 LIBRARY        etelmm.lib 
 LIBRARY        commonengine.lib
 LIBRARY        featmgr.lib
 LIBRARY        fbscli.lib 
-LIBRARY        estor.lib    
+LIBRARY		   estor.lib	
 LIBRARY        centralrepository.lib
-LIBRARY        imageconversion.lib  
+LIBRARY        imageconversion.lib 	
 LIBRARY        bitmaptransforms.lib 
-LIBRARY        hbwidgets.lib
-LIBRARY        hbcore.lib
+LIBRARY        ecom.lib 
 
 //  End of File