diff -r e0ec97ec3cc4 -r 98924d2efce9 creator/creator.pro
--- a/creator/creator.pro	Wed Jun 23 18:13:31 2010 +0300
+++ b/creator/creator.pro	Tue Jul 06 14:17:03 2010 +0300
@@ -19,16 +19,10 @@
 symbian: {
         INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 	HEADERS += engine/inc/creator.hrh \
-			engine/inc/creator_accesspoint.h \
-			engine/inc/creator_browser.h \
-			engine/inc/creator_browserelement.h \
 			engine/inc/creator_calendar.h \
 			engine/inc/creator_calendarbase.h \
 			engine/inc/creator_calendarelement.h \
 			engine/inc/creator_cmdscriptrun.h \
-			engine/inc/creator_connectionmethod.h \
-			engine/inc/creator_connectionmethodbase.h \
-			engine/inc/creator_connectionmethodelement.h \
 			engine/inc/creator_contactelement.h \
 			engine/inc/creator_contactsetcache.h \
 			engine/inc/creator_factory.h \
@@ -44,7 +38,10 @@
 			engine/inc/creator_messageelement.h \
 			engine/inc/creator_modulebase.h \
 			engine/inc/creator_note.h \
+			engine/inc/creator_notepadwrapper.h \
 			engine/inc/creator_phonebook.h \
+			engine/inc/creator_phonebookwrapper.h \
+			engine/inc/creator_phonebookapi.h \
 			engine/inc/creator_phonebookbase.h \
 			engine/inc/creator_randomdatafield.h \
 			engine/inc/creator_randomdataparser.h \
@@ -59,14 +56,9 @@
 			inc/engine.h \
 			inc/enginewrapper.h
 
-	SOURCES += engine/src/creator_accesspoint.cpp \
-			engine/src/creator_browser.cpp \
-			engine/src/creator_browserelement.cpp \
-			engine/src/creator_calendar.cpp \
+	SOURCES += engine/src/creator_calendar.cpp \
 			engine/src/creator_calendarelement.cpp \
 			engine/src/creator_cmdscriptrun.cpp \
-			engine/src/creator_connectionmethod.cpp \
-			engine/src/creator_connectionmethodelement.cpp \
 			engine/src/creator_contactelement.cpp \
 			engine/src/creator_contactsetcache.cpp \
 			engine/src/creator_factory.cpp \
@@ -81,7 +73,10 @@
 			engine/src/creator_message.cpp \
 			engine/src/creator_messageelement.cpp \
 			engine/src/creator_note.cpp \
+			engine/src/creator_notepadwrapper.cpp \
 			engine/src/creator_phonebook.cpp \
+			engine/src/creator_phonebookwrapper.cpp \
+			engine/src/creator_phonebookapi.cpp \
 			engine/src/creator_phonebookbase.cpp \
 			engine/src/creator_randomdataparser.cpp \
 			engine/src/creator_scriptelement.cpp \
@@ -100,7 +95,6 @@
 			-lapparc \
 			-lcone \ 
 			-lcntmodel \
-			-lfavouritesengine \
 			-lmsgs \
 			-llogwrap \
 			-llogcli \
@@ -139,7 +133,6 @@
 			-lbitmaptransforms \
 			-lcmmanager \
 			-lcmmanagerdatabase \
-			-lapengine \
 			-lnoteseditor \
 			-lxqservice \
 		    -lQtContacts \