Taking S4 features into symbian contacts model

188 files changed, 77 insertions, 308 deletions

diff --git a/plugins/contacts/symbian/contactsmodel/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/groupsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/groupsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/groupsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/inc/cntdbconsts_internal.h b/plugins/contacts/symbian/contactsmodel/inc/cntdbconsts_internal.h
index 1288c2ae5c..5ff3818129 100644
--- a/plugins/contacts/symbian/contactsmodel/inc/cntdbconsts_internal.h
+++ b/plugins/contacts/symbian/contactsmodel/inc/cntdbconsts_internal.h
@@ -22,7 +22,11 @@
 const TInt KMaxImageSize = 100000; // 100KB
 
 // Internal folder to store contact thumbnail images
+#ifdef UNIT_TEST
+_LIT(KImagesFolder, "imagerescale_test\\");
+#else
 _LIT(KImagesFolder, "10003A73\\");
+#endif
 
 // S60 specific contact field type containing image call object data
 #define KUidContactFieldCodImageValue 0x101F8841
diff --git a/plugins/contacts/symbian/contactsmodel/inc/cntdef.h b/plugins/contacts/symbian/contactsmodel/inc/cntdef.h
index 960d09d07b..90f3cd9377 100644
--- a/plugins/contacts/symbian/contactsmodel/inc/cntdef.h
+++ b/plugins/contacts/symbian/contactsmodel/inc/cntdef.h
@@ -965,7 +965,6 @@ const TUid KUidContactFieldFavourite={KUidContactFieldFavouriteValue};
 */
 const TUid KUidContactFieldVCardMapFavourite={KIntContactFieldVCardMapFavourite};
 
-
 /** Name of the TYPE property parameter, for which the values are work, home etc. 
 @publishedAll
 @released
diff --git a/plugins/contacts/symbian/contactsmodel/inc/cntviewbase.h b/plugins/contacts/symbian/contactsmodel/inc/cntviewbase.h
index 9be2317a74..6e3560b4e9 100644
--- a/plugins/contacts/symbian/contactsmodel/inc/cntviewbase.h
+++ b/plugins/contacts/symbian/contactsmodel/inc/cntviewbase.h
@@ -80,7 +80,10 @@ enum TContactViewPreferences
 	EICCEntriesOnly					=0x00000040, 
 	/** Only contact cards and ICC entries (of type KUidContactCard, KUidContactOwnCard 
 	or KUidContactICCEntry) are included in the view. */
-	EICCEntriesAndContacts			=0x00000080  
+	EICCEntriesAndContacts			=0x00000080,
+	/** Only contact cards (of type KUidContactCard) are included 
+	in the view. Own card not included. */
+    EContactCardsOnly				=0x00000100
 	};
 
 
diff --git a/plugins/contacts/symbian/contactsmodel/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/asynaccess/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntfindplugin/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntmatchlog/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntmodel2/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlfactory.h b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlfactory.h
deleted file mode 100644
index 403b966fd3..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlfactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Retrieves the character map for each of the numeric keys.
-*/
-
-#ifndef UT_CNTSQLFACTORY_H_
-#define UT_CNTSQLFACTORY_H_
-
-#include <QObject>
-
-class CntSqlFactory;
-class C12keyKeyMap;
-
-class UT_CntSqlFactory : public QObject                 
-{
-     Q_OBJECT
-    
-private slots:
-
-/*
- * In addition, there are four private slots that are not treated as testfunctions. 
- * They will be executed by the testing framework and can be used to initialize and clean up 
- * either the entire test or the current test function.
- * 
- * initTestCase() will be called before the first testfunction is executed.
- * cleanupTestCase() will be called after the last testfunction was executed.
- * init() will be called before each testfunction is executed.
- * cleanup() will be called after every testfunction.
-*/
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots: //test methods
-
-    void testGetSqlIinstance();
-   
-    
-private:
- 
-    C12keyKeyMap* m12KeyKeyMap;
-    CntSqlFactory* mCntSqlFactory;
-
-};
-
-#endif /* UT_CNTSQLFACTORY_H_ */
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlkoreanitut.h b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlkoreanitut.h
deleted file mode 100644
index 6c03539a93..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlkoreanitut.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Retrieves the character map for each of the numeric keys.
-*/
-
-#ifndef UT_CNTSQLKOREANITUT_H_
-#define UT_CNTSQLKOREANITUT_H_
-
-#include <QObject>
-
-class CntSqlKoreanItuT;
-class C12keyKeyMap;
-
-class UT_CntSqlKoreanItuT : public QObject                 
-{
-     Q_OBJECT
-    
-private slots:
-
-/*
- * In addition, there are four private slots that are not treated as testfunctions. 
- * They will be executed by the testing framework and can be used to initialize and clean up 
- * either the entire test or the current test function.
- * 
- * initTestCase() will be called before the first testfunction is executed.
- * cleanupTestCase() will be called after the last testfunction was executed.
- * init() will be called before each testfunction is executed.
- * cleanup() will be called after every testfunction.
-*/
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots: //test methods
-
-    void testCreateInputSpecificSearch();     
-    void testGetSQLQueryType();
-    
-private:
- 
-    CntSqlKoreanItuT* mSqlKoreanItuT;
-    C12keyKeyMap* mTwelveKeyMap;
- 
-};
-#endif /* UT_CNTSQLKOREANITUT_H_ */
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlsearch.h b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlsearch.h
index e175ff0338..dc0df4c29a 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlsearch.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlsearch.h
@@ -46,6 +46,7 @@ private slots:
 
 private slots: //test methods
 
+    void testCompareTwoColumnsWithModifiedPattern();
     void testPredictiveSearch();
     void testSelectQweryTable();
     void testSelectTableView();
@@ -55,7 +56,7 @@ private slots: //test methods
     void testExactMatchSearchQwerty();
     void testIntersectionSearch();
     void testSearchTokensFromOneTable();
-    void testCompareTwoColumnsWithModifiedPattern();   
+    //void testCompareTwoColumnsWithModifiedPattern();   
     void testModifiedMatchColumns();
     void testExactMatch();
     void testExactMatchQwerty();
@@ -67,7 +68,6 @@ private slots: //test methods
     void testGetTokens();
     void testTestPattern();
     void testIsQwerty();
-    void testremZerosEndOfString();
     void testQwertyTokens();
     
     
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntsimplesortplugin/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntvcard/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/cntviewstore/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/cntviewstore/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntviewstore/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/databases/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/databases/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/databases/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/fuzztest/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/testdesign/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/testdesign/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/testdesign/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/testspec/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/testspec/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/documentation/testspec/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/groupsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/groupsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/groupsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/addmodifydeletecontactfields.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/addmodifydeletecontactfields.h
index bdcbbf352e..f3ea7b81fb 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/addmodifydeletecontactfields.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/addmodifydeletecontactfields.h
@@ -22,7 +22,7 @@
 #define __ADD_MODIFY_DELETE_CONTACTS__
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntbasestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntbasestep.h
index dce8238263..480b1b9aef 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntbasestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntbasestep.h
@@ -26,7 +26,7 @@
 #ifndef __CNT_BASE_STEP_H__
 #define __CNT_BASE_STEP_H__
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include "cntperfserver.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntperfserver.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntperfserver.h
index 000b1a6463..bae9aaa4c3 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntperfserver.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/cntperfserver.h
@@ -26,7 +26,7 @@
 
 #ifndef __CNT_PERF_SERVER_H__
 #define __CNT_PERF_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 class CCntPerfServer : public CTestServer
 	{
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactutilitiescollection.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactutilitiescollection.h
index 08ead5a47e..4014eef00e 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactutilitiescollection.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactutilitiescollection.h
@@ -43,7 +43,7 @@
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // Constant Literals
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactviewsthread.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactviewsthread.h
index b7dba5042f..a82349e9b5 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactviewsthread.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/contactviewsthread.h
@@ -22,7 +22,7 @@
 #define __CONTACTVIEWS_THREAD_H__
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/preparedatateststep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/preparedatateststep.h
index b7d8b4560d..480fe428ef 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/preparedatateststep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/preparedatateststep.h
@@ -22,7 +22,7 @@
 #define __PREPARE_DATA_TEST_STEP_H__
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewaccessstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewaccessstep.h
index 454aca4974..501c93a2dc 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewaccessstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewaccessstep.h
@@ -27,12 +27,12 @@
 #define TEST_CONTACT_VIEW_ACCESS_STEP_H
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdef.h>
 #include <cntviewbase.h>
 #include <cntdb.h>
 #include <e32property.h>
-#include <sbeclient.h>
+#include <connect/sbeclient.h>
 
 // User Includes
 #include "cntperfserver.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewcrudoperationsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewcrudoperationsstep.h
index deff8d7c71..ad7c91d4a3 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewcrudoperationsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewcrudoperationsstep.h
@@ -22,7 +22,7 @@
 #define __TEST_CONTACTVIEW_CRUD_OPERATIONS_H__
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewdatabaseutilitiesstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewdatabaseutilitiesstep.h
index 0774d40201..9812cab2f6 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewdatabaseutilitiesstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewdatabaseutilitiesstep.h
@@ -22,7 +22,7 @@
 #define __TEST_CONTACTVIEW_DATABASE_UTILITIES_H__
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewunderlyingviewupdatestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewunderlyingviewupdatestep.h
index 14668cb8d7..5908a1fcf3 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewunderlyingviewupdatestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/inc/testcontactviewunderlyingviewupdatestep.h
@@ -22,7 +22,7 @@
 #define __TEST_CONTACTVIEW_UNDERLYING_VIEW_UPDATE_H__
 
 // System Includes
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include <cntviewbase.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/scripts/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/scripts/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/scripts/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/scriptssql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/scriptssql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/scriptssql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/testdata/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/testdata/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/testdata/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/testdata/vcf/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/testdata/vcf/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/cntperftest/testdata/vcf/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/documentation/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/documentation/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/documentation/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/groupsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/groupsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/groupsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/compactandrecoverstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/compactandrecoverstep.h
index 9540abe1a7..b46c7ccdbb 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/compactandrecoverstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/compactandrecoverstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __COMPACTRECOVER_STEP_H__
 #define __COMPACTRECOVER_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CCompactAndRecoverStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentlistenerstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentlistenerstep.h
index cf06a31929..d1b3a578d8 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentlistenerstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentlistenerstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __CONCURRENT_LISTENER_STEP_H__
 #define __CONCURRENT_LISTENER_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CConcurrentListenerStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentnotifierstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentnotifierstep.h
index 7d89b508d7..4fa1f01137 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentnotifierstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrentnotifierstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __CONCURRENT_NOTIFIER_STEP_H__
 #define __CONCURRENT_NOTIFIER_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CConcurrentNotifierStep : public CPerformanceFunctionalityBase 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutlistenerstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutlistenerstep.h
index 159e9fa399..e41e73dd6f 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutlistenerstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutlistenerstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __CONCURRENT_TIMEOUT_LISTENER_STEP_H__
 #define __CONCURRENT_TIMEOUT_LISTENER_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "timeoutbasestep.h"
 
 class CConcurrentTimeOutListenerStep : public CTimeoutBaseStep 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutnotifierstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutnotifierstep.h
index 0f0a10d9b4..45206e7bcb 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutnotifierstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/concurrenttimeoutnotifierstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __CONCURRENT_TIMEOUT_NOTIFIER_STEP_H__
 #define __CONCURRENT_TIMEOUT_NOTIFIER_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CConcurrentTimeOutNotifierStep : public CPerformanceFunctionalityBase 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/crudoomstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/crudoomstep.h
index a2b2fe3d02..b4862a0d28 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/crudoomstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/crudoomstep.h
@@ -25,7 +25,7 @@
 */
 #if (!defined __CCRUDOOM_STEP_H__)
 #define __CCRUDOOM_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntviewbase.h>
 #include "performancefunctionalitybase.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/lowdiskspacestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/lowdiskspacestep.h
index 0f446c0f10..496e03da85 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/lowdiskspacestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/lowdiskspacestep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __LOWDISKSPACE_STEP_H__
 #define __LOWDISKSPACE_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CLowDiskSpaceStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/notificationstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/notificationstep.h
index 1271e2555f..9681ea07b3 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/notificationstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/notificationstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __NOTIFICATION_STEP_H__
 #define __NOTIFICATION_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CNotificationStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalitybase.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalitybase.h
index 2b015f0d29..3b3e8877be 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalitybase.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalitybase.h
@@ -26,7 +26,7 @@
 
 #ifndef __PERFORMANCEFUNCTIONALITY_BASE__
 #define __PERFORMANCEFUNCTIONALITY_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <cntitem.h>
 #include "rcntlist.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalityserver.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalityserver.h
index efc1f4b91f..5df8135263 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalityserver.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/performancefunctionalityserver.h
@@ -26,7 +26,7 @@
 
 #ifndef __PERFORMANCEFUNCTIONALITY_SERVER_H__
 #define __PERFORMANCEFUNCTIONALITY_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 
 class CPerformanceFunctionalityTestsSuite : public CTestServer
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/randomblobstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/randomblobstep.h
index 6791820d75..7560a3bfc1 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/randomblobstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/randomblobstep.h
@@ -25,7 +25,7 @@
 */
 #if (!defined __RANDOMBLOB_STEP_H__)
 #define __RANDOMBLOB_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CRandomBlobStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/requestmixstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/requestmixstep.h
index 444bf781d1..103167a6af 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/requestmixstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/requestmixstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __REQUESTMIX_STEP_H__
 #define __REQUESTMIX_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CRequestMixStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/statemachinestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/statemachinestep.h
index f296f81c11..73de5a11d3 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/statemachinestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/statemachinestep.h
@@ -27,7 +27,7 @@
 #ifndef __STATEMACHINE_STEP_H__
 #define __STATEMACHINE_STEP_H__
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutbasestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutbasestep.h
index 856d6625f2..8a83311e88 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutbasestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutbasestep.h
@@ -25,7 +25,7 @@
 */
 #if (!defined __TIMEOUT_BASE_STEP_H__)
 #define __TIMEOUT_BASE_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 class CTimeoutBaseStep : public CPerformanceFunctionalityBase
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutstep.h
index 879082a3bd..b2d6b0dc07 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/timeoutstep.h
@@ -25,7 +25,7 @@
 */
 #if (!defined __TIMEOUT_STEP_H__)
 #define __TIMEOUT_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "timeoutbasestep.h"
 
 class CTimeoutStep : public CTimeoutBaseStep
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/transactionsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/transactionsstep.h
index bc4cd46000..c2efbfebbf 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/transactionsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/inc/transactionsstep.h
@@ -25,7 +25,7 @@
 */
 #ifndef __TRANSACTION_STEP_H__
 #define __TRANSACTION_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "performancefunctionalitybase.h"
 
 enum FieldFullness
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/scripts/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/scripts/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/scripts/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/testdata/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/testdata/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/perffuncsuite/testdata/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/groupsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/groupsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/groupsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/csuite.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/csuite.h
index 7e0f19e086..ae82bda3b1 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/csuite.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/csuite.h
@@ -25,8 +25,8 @@
 #include <e32svr.h>
 #include <f32file.h>
 #include <e32test.h>
-#include <testexecutestepbase.h>
-#include <testexecuteserverbase.h>
+#include <test/testexecutestepbase.h>
+#include <test/testexecuteserverbase.h>
 
 //The two ways to get thru
 #define API_RetValue_ServerPanic			0
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/csuite.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/csuite.h
index f6dce47435..b952f4c93a 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/csuite.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/csuite.h
@@ -23,8 +23,8 @@
 #include <e32svr.h>
 #include <f32file.h>
 #include <e32test.h>
-#include <testexecutestepbase.h>
-#include <testexecuteserverbase.h>
+#include <test/testexecutestepbase.h>
+#include <test/testexecuteserverbase.h>
 
 //The two ways to get thru
 #define API_RetValue_ServerPanic			0
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/incsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/scripts/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/scripts/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/scripts/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/scriptssql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/scriptssql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/scriptssql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/srcsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/srcsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/srcsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/csuite.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/csuite.h
index 4ca86b7fa9..5883ceeece 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/csuite.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/csuite.h
@@ -25,8 +25,8 @@
 #include <e32svr.h>
 #include "f32file.h"
 #include "e32test.h"
-#include <testexecutestepbase.h>
-#include <testexecuteserverbase.h>
+#include <test/testexecutestepbase.h>
+#include <test/testexecuteserverbase.h>
 
 //The two ways to get thru
 #define API_RetValue_ServerPanic			0
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/tcntpolice/template/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/documentation/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/documentation/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/documentation/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/scripts/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/scripts/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/scripts/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddfieldsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddfieldsstep.h
index 5b73d0dc33..12d1e4fbbc 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddfieldsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddfieldsstep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTADDFIELDSSTEP_H__)
 #define __TESTADDFIELDSSTEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 class CTestAddFieldsStep : public CTestStep
 	{
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddmultiplecontactsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddmultiplecontactsstep.h
index 3450a87725..d4f18c0572 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddmultiplecontactsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testaddmultiplecontactsstep.h
@@ -20,8 +20,7 @@
 
 #if (!defined __TESTADDMULTIPLECONTACTSSTEP_H__)
 #define __TESTADDMULTIPLECONTACTSSTEP_H__
-#include <testexecutestepbase.h>
-//#include "testcontactsuiteserver.h"
+#include <test/testexecutestepbase.h>
 class CTestAddMultipleContactsStep : public CTestStep
 	{
 public:
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactperformancestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactperformancestep.h
index 05a08ee60c..b9954fc8df 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactperformancestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactperformancestep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTCONTACTPERFORMANCESTEP_H__)
 #define __TESTCONTACTPERFORMANCESTEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 class CTestContactPerformanceStep : public CTestStep
 	{
 public:
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactsuiteserver.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactsuiteserver.h
index 44d3b9d8df..652d5c123c 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactsuiteserver.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testcontactsuiteserver.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTCONTACT_SERVER_H__)
 #define __TESTCONTACT_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 #include <cntitem.h>
 #include <cntfield.h>
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletefieldsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletefieldsstep.h
index fe5de6477c..184c17c93c 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletefieldsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletefieldsstep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTDELETEFIELDSSTEP_H__)
 #define __TESTDELETEFIELDSSTEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 _LIT(KTestDeleteFieldsStep,"TestDeleteFieldsStep");
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletemultiplecontactsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletemultiplecontactsstep.h
index 65ed9bb624..c288bba766 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletemultiplecontactsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testdeletemultiplecontactsstep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTDELETEMULTIPLECONTACTSSTEP_H__)
 #define __TESTDELETEMULTIPLECONTACTSSTEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 class CTestDeleteMultipleContactsStep : public CTestStep
 	{
 public:
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatefieldsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatefieldsstep.h
index 9329293be2..bd8afe6344 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatefieldsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatefieldsstep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTUPDATEFIELDSSTEP_H__)
 #define __TESTUPDATEFIELDSSTEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 _LIT(KTestUpdateFieldsStep,"TestUpdateFieldsStep");
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatemultiplecontactsstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatemultiplecontactsstep.h
index f048389f03..3edc2dcd03 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatemultiplecontactsstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testcontactsuite/src/testupdatemultiplecontactsstep.h
@@ -20,8 +20,7 @@
 
 #if (!defined __TESTUPDATEMULTIPLECONTACTSSTEP_H__)
 #define __TESTUPDATEMULTIPLECONTACTSSTEP_H__
-#include <testexecutestepbase.h>
-//#include "testcontactsuiteserver.h"
+#include <test/testexecutestepbase.h>
 class CTestUpdateMultipleContactsStep : public CTestStep
 	{
 public:
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/documentation/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/documentation/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/documentation/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/groupsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/groupsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/groupsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcomparecntfiles.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcomparecntfiles.h
index 68d683b621..3f49de2218 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcomparecntfiles.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcomparecntfiles.h
@@ -27,7 +27,7 @@
 #include <s32file.h>
 #include <e32std.h>
 #include <f32file.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // User includes
 #include "testimpexvcardsuitedefs.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactoperations.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactoperations.h
index 6db0f35030..618983e76c 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactoperations.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactoperations.h
@@ -32,7 +32,7 @@
 #include <vcard.h>
 #include <cntitem.h>
 #include <cntfldst.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // User includes
 #include "cntvcardutils.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexport.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexport.h
index 7add94a717..c651abeb61 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexport.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexport.h
@@ -32,7 +32,7 @@
 #include <vcard.h>
 #include <cntitem.h>
 #include <cntfldst.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // User includes
 #include "cntvcardutils.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportcontents.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportcontents.h
index 583f6ef024..834004df0e 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportcontents.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportcontents.h
@@ -27,7 +27,7 @@
 #include <s32file.h>
 #include <e32std.h>
 #include <f32file.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // User includes
 #include "testimpexvcardsuiteserver.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportperformance.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportperformance.h
index 3fcfc774ae..ee3cd7cf08 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportperformance.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testcontactspbapexportperformance.h
@@ -32,7 +32,7 @@
 #include <vcard.h>
 #include <cntitem.h>
 #include <cntfldst.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // User includes
 #include "cntvcardutils.h"
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testgenericimportstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testgenericimportstep.h
index afa78ae587..721a3bc00e 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testgenericimportstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/inc/testgenericimportstep.h
@@ -27,7 +27,7 @@
 #include <s32file.h>
 #include <e32std.h>
 #include <f32file.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <cntdb.h>
 #include <vcard.h>
 #include <cntitem.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/scripts/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/scripts/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/scripts/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexbdaylocal.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexbdaylocal.h
index db1e822cfe..0390ee45a5 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexbdaylocal.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexbdaylocal.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTEXBDAYLOCAL_H__)
 #define __TESTEXBDAYLOCAL_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexnobday.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexnobday.h
index 1aa5ddf6c5..69bde8f51b 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexnobday.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexnobday.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTEXNOBDAY_H__)
 #define __TESTEXNOBDAY_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexportcontactstep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexportcontactstep.h
index be7e9e856b..957655931c 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexportcontactstep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexportcontactstep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTEXPORTCONTACT_H__)
 #define __TESTEXPORTCONTACT_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testexportcontactstep.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexrevutc.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexrevutc.h
index 794b44ac95..7bff1ab1b5 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexrevutc.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testexrevutc.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTEXREVUTC_H__)
 #define __TESTEXREVUTC_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpbday.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpbday.h
index acb271ba5f..d06d026d33 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpbday.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpbday.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPBDAY_H__)
 #define __TESTIMPBDAY_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuiteserver.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuiteserver.h
index 2004673e8e..93d8c62e6e 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuiteserver.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuiteserver.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPEXVCARD_SERVER_H__)
 #define __TESTIMPEXVCARD_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 // Literal constants for INI file field-names
 _LIT(KIniFieldName, 			"fieldname");
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuitestepbase.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuitestepbase.h
index 00a76604c8..6bb6cc2138 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuitestepbase.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpexvcardsuitestepbase.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPEXVCARD_STEP_BASE__)
 #define __TESTIMPEXVCARD_STEP_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitedefs.h"
 
 /****************************************************************************
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnobday.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnobday.h
index 7c50e609e0..5c6894ee4d 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnobday.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnobday.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPNOBDAY_H__)
 #define __TESTIMPNOBDAY_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnorev.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnorev.h
index 93c04623a3..d915bed213 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnorev.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpnorev.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPNOREV_H__)
 #define __TESTIMPNOREV_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpoom.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpoom.h
index 68a5a2c511..1e7f7c3646 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpoom.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimpoom.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPOOM_H__)
 #define __TESTIMPOOM_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactinsertmodestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactinsertmodestep.h
index f46befc8e8..09a528fa04 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactinsertmodestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactinsertmodestep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPORTCONTACTINSERTMODE_H__)
 #define __TESTIMPORTCONTACTINSERTMODE_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimportcontactinsertmodestep.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactmergemodestep.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactmergemodestep.h
index b916949545..d432c6a4af 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactmergemodestep.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimportcontactmergemodestep.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPORTCONTACTMERGEMODE_H__)
 #define __TESTIMPORTCONTACTMERGEMODE_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimportcontactmergemodestep.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocal.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocal.h
index 418eb44dee..48d9936361 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocal.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocal.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPREVLOCAL_H__)
 #define __TESTIMPREVLOCAL_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocaltz.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocaltz.h
index fec197a2cf..5e173d7655 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocaltz.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevlocaltz.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPREVLOCALTZ_H__)
 #define __TESTIMPREVLOCALTZ_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevutc.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevutc.h
index 7fe71e358f..b757b8a134 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevutc.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/src/testimprevutc.h
@@ -20,7 +20,7 @@
 
 #if (!defined __TESTIMPREVUTC_H__)
 #define __TESTIMPREVUTC_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "testimpexvcardsuitestepbase.h"
 #include "testimpexvcardsuitedefs.h"
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportbdaylocal/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportbdaylocal/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportbdaylocal/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportnobday/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportnobday/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportnobday/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportrevutc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportrevutc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/exportrevutc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importbday/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importbday/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importbday/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importnobday/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importnobday/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importnobday/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importnorev/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importnorev/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importnorev/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importoom/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importoom/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importoom/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevlocal/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevlocal/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevlocal/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevlocaltz/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevlocaltz/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevlocaltz/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevutc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevutc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/importrevutc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/pbapexport/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/pbapexport/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/pbapexport/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/pbapexportsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/pbapexportsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/pbapexportsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/preq1286/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/preq1286/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/testimpexvcard/testdata/preq1286/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/data/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/data/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/data/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/documentation/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/documentation/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/documentation/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/teststartupserver.h b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/teststartupserver.h
index 03a095fdf9..ff1b68dcd7 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/teststartupserver.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/inc/teststartupserver.h
@@ -21,12 +21,12 @@
 #ifndef __TESTSTARTUPSERVER_H__
 #define __TESTSTARTUPSERVER_H__
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <e32base.h>
 #include <cntviewbase.h>
 #include <cntviewstore.h>
 #include <centralrepository.h>
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 #include <cntdb.h>
 #include <cntitem.h>
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/scripts/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/scripts/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/scripts/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/integration/teststartup/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/nbcnttestlib/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/nbcnttestlib/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/nbcnttestlib/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/bwins/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/bwins/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/bwins/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/eabi/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/eabi/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/eabi/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/client/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/server/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/packagerclientserver/test/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/performance/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/performance/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/performance/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/performance/t_perfdbcreator.h b/plugins/contacts/symbian/contactsmodel/tsrc/performance/t_perfdbcreator.h
index 731bd7b30e..db1c9016c7 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/performance/t_perfdbcreator.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/performance/t_perfdbcreator.h
@@ -29,7 +29,7 @@
 #include <cntitem.h>
 #include <cntfldst.h>
 #include <cntviewbase.h>
-#include <ecom.h>
+#include <ecom/ecom.h>
 
 
 
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/t_cnt_backup.h b/plugins/contacts/symbian/contactsmodel/tsrc/t_cnt_backup.h
index 31511a4e09..43901b5cd5 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/t_cnt_backup.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/t_cnt_backup.h
@@ -17,7 +17,6 @@
 
 
 #include <e32property.h>
-#include <app-services/private/cbackuprestorenotification.h>
 
 //
 // Forward declarations.
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/t_utils2.h b/plugins/contacts/symbian/contactsmodel/tsrc/t_utils2.h
index 4335d7a53e..bfcab0cc31 100644
--- a/plugins/contacts/symbian/contactsmodel/tsrc/t_utils2.h
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/t_utils2.h
@@ -28,7 +28,8 @@
 
 class CContactItem;
 class CContactDatabase;
-
+class RTest;
+class CContactTemplate;
 //
 // CLog.
 //
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/testsyncplugin/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/testsyncplugin/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/testsyncplugin/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/distribution.policy.S60 b/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/distribution.policy.S60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/distribution.policy.S60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/group/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/group/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/group/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/inc/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/inc/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/inc/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/src/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/src/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrc/unittest_cntpbapsupport/src/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/plugins/contacts/symbian/contactsmodel/tsrcsql/distribution.policy.s60 b/plugins/contacts/symbian/contactsmodel/tsrcsql/distribution.policy.s60
deleted file mode 100644
index c7930257df..0000000000
--- a/plugins/contacts/symbian/contactsmodel/tsrcsql/distribution.policy.s60
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file