--- a/common/tools/ats/smoketest/Group/smoketest.pl	Mon Nov 02 13:36:09 2009 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.pl	Mon Nov 02 13:46:30 2009 +0000
@@ -11,7 +11,6 @@
 mkpath "temp/smoketest/sms/general";
 mkpath "temp/smoketest/emailmessage/general";
 mkpath "temp/smoketest/emailsettings/general";
-mkpath "temp/smoketest/general/TestFramework";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("smoketest.xml",												"temp/test.xml");
@@ -49,6 +48,6 @@
 copy($epoc . "release/winscw/udeb/t_msgsmtpserver.exe",				"temp/smoketest/winscw_udeb/t_msgsmtpserver.exe");
 
 copy($epoc . "release/winscw/udeb/ProfileSmokeTestModule.dll",      "temp/smoketest/winscw_udeb/ProfileSmokeTestModule.dll");
-copy($epoc . "winscw/c/TestFramework/ProfileSmokeTestModule.cfg",   "temp/smoketest/general/TestFramework/ProfileSmokeTestModule.cfg");
+copy($epoc . "winscw/c/smoketest/ProfileSmokeTestModule.cfg",       "temp/smoketest/general/ProfileSmokeTestModule.cfg");
 
 system("7z a -tzip smoketest.zip ./temp/*");

--- a/common/tools/ats/smoketest/Group/smoketest.xml	Mon Nov 02 13:36:09 2009 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.xml	Mon Nov 02 13:46:30 2009 +0000
@@ -264,8 +264,8 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="TestFramework/ProfileSmokeTestModule.cfg"/>
-							<param dst="c:\TestFramework\ProfileSmokeTestModule.cfg"/>
+							<param src="ProfileSmokeTestModule.cfg"/>
+							<param dst="c:\smoketest\ProfileSmokeTestModule.cfg"/>
 							<param component-path="smoketest" />
 						</params>
 					</step>
@@ -273,7 +273,7 @@
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testscripter -config c:\TestFramework\ProfileSmokeTestModule.cfg"/>
+							<param parameters="-testmodule testscripter -config c:\smoketest\ProfileSmokeTestModule.cfg"/>
 							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
 							<param timeout="600"/>
 						</params>
@@ -313,6 +313,6 @@
 		<file>smoketest/winscw_udeb/t_msgpopserver.exe</file>
 		<file>smoketest/winscw_udeb/t_msgsmtpserver.exe</file>
         <file>smoketest/winscw_udeb/ProfileSmokeTestModule.dll</file>
-        <file>smoketest/general/TestFramework/ProfileSmokeTestModule.cfg</file>
+        <file>smoketest/general/ProfileSmokeTestModule.cfg</file>
 	</files>
 </test>

--- a/common/tools/ats/smoketest/profiles/group/Bld.inf	Mon Nov 02 13:36:09 2009 +0000
+++ b/common/tools/ats/smoketest/profiles/group/Bld.inf	Mon Nov 02 13:46:30 2009 +0000
@@ -24,7 +24,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
-../conf/ProfileSmokeTestModule.cfg c:/TestFramework/ProfileSmokeTestModule.cfg
+../conf/ProfileSmokeTestModule.cfg c:/smoketest/ProfileSmokeTestModule.cfg
 
 PRJ_TESTMMPFILES