--- a/cmmanager/cmmgr/group/bld.inf	Thu Aug 19 10:18:49 2010 +0300
+++ b/cmmanager/cmmgr/group/bld.inf	Tue Aug 31 15:35:44 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -11,7 +11,8 @@
 *
 * Contributors:
 *
-* Description:  Build information for the Connection Method Manager
+* Description:
+* Build information for the Connection Method Manager.
 *
 */
 
@@ -22,26 +23,13 @@
 DEFAULT
 
 PRJ_EXPORTS
-// export iby files
-../Rom/CmManager.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(CmManager.iby)
-../Rom/CmManagerResources.iby			LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(CmManagerResources.iby)
-
-../Rom/cmpluginembdestination.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(cmpluginembdestination.iby)
-../Rom/cmpluginembdestinationresources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(cmpluginembdestinationresources.iby)
-
-../Rom/cmpluginpacketdata.iby			CORE_MW_LAYER_IBY_EXPORT_PATH(cmpluginpacketdata.iby)
-../Rom/cmpluginpacketdataresources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(cmpluginpacketdataresources.iby)
-
-../Rom/cmpluginvpn.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(cmpluginvpn.iby)
-../Rom/cmpluginvpnresources.iby			LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(cmpluginvpnresources.iby)
-
-../Rom/cmpluginwlan.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(cmpluginwlan.iby)
-../Rom/cmpluginwlanresources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(cmpluginwlanresources.iby)
-
 
 PRJ_MMPFILES
-// None
+#include "../database/group/bld.inf"
+#include "../cmmapi/group/bld.inf"
+#include "../cmmpluginbase/group/bld.inf"
+#include "../cmmserver/group/bld.inf"
+#include "../cmmplugins/group/bld.inf"
 
-#include "../database/group/bld.inf"
-#include "../Framework/Group/bld.inf"
-#include "../Plugins/Group/bld.inf"
+PRJ_TESTMMPFILES
+