--- a/activityfw/activityserviceplugin/activityserviceplugin.pro	Fri Apr 30 15:22:08 2010 +0300
+++ b/activityfw/activityserviceplugin/activityserviceplugin.pro	Fri May 14 17:24:44 2010 +0300
@@ -20,27 +20,32 @@
 CONFIG += plugin 
 include(activityserviceplugin.pri)
 
-HEADERS +=  activityserviceplugin.h \
-            activitydatastorage.h \
-            activityclient.h \
-            activityclient_p.h \
-            activitymanager.h \
-            activitymanager_p.h \
-            applicationlauncher.h \
+INCLUDEPATH += ./inc \
+             #../cautils/inc \
+             #../extinc \
 
-SOURCES +=  activityserviceplugin.cpp \
-            activitydatastorage.cpp \
-            activityclient.cpp \
-            activityclient_p.cpp \
-            activitymanager.cpp \
-            activitymanager_p.cpp \
-            applicationlauncher.cpp \
+HEADERS +=  ./inc/activityserviceplugin.h \
+            ./inc/activitydatastorage.h \
+            ./inc/activityclient.h \
+            ./inc/activityclient_p.h \
+            ./inc/activitymanager.h \
+            ./inc/activitymanager_p.h \
+            ./inc/applicationlauncher.h \
+
+SOURCES +=  ./src/activityserviceplugin.cpp \
+            ./src/activitydatastorage.cpp \
+            ./src/activityclient.cpp \
+            ./src/activityclient_p.cpp \
+            ./src/activitymanager.cpp \
+            ./src/activitymanager_p.cpp \
+            ./src/applicationlauncher.cpp \
 
 symbian {
-    INCLUDEPATH += ./s60/
-    SOURCES += ./s60/applicationlauncher_p.cpp
+    INCLUDEPATH += ./s60/inc \
+
+    SOURCES += ./s60/src/applicationlauncher_p.cpp
     
-    HEADERS += ./s60/applicationlauncher_p.h
+    HEADERS += ./s60/src/applicationlauncher_p.h
 
     LIBS += -lapparc \
             -lapgrfx \
@@ -51,10 +56,11 @@
 }
 
 win32 {
-    INCLUDEPATH += ./win/
-    SOURCES += ./win/applicationlauncher_p.cpp
+    INCLUDEPATH += ./win/inc \
 
-    HEADERS += ./win/applicationlauncher_p.h
+    SOURCES += ./win/src/applicationlauncher_p.cpp
+
+    HEADERS += ./win/inc/applicationlauncher_p.h
 }            
             
 symbian {
@@ -63,7 +69,11 @@
     TARGET.CAPABILITY = ALL -TCB
     TARGET.UID3 = 0x200267B2
 
-
     plugin.sources = activityserviceplugin.dll
     plugin.path = $$QT_PLUGINS_BASE_DIR     
+    
+    xml.sources = ./data/activityserviceplugin.xml
+    xml.path = $$RESOURCE_FILES_DIR/activity
+    
+    DEPLOYMENT += xml
 }