--- a/webengine/wmlengine/group/xhtml/xhtml.mmp	Fri Apr 16 16:07:13 2010 +0300
+++ b/webengine/wmlengine/group/xhtml/xhtml.mmp	Mon May 03 13:32:15 2010 +0300
@@ -32,49 +32,49 @@
 
 #include  "../webkitcommon.mmpi"
 
-SOURCE	structure/XHTMLHeadElementHandler.cpp
-SOURCE	structure/XHTMLStructureModule.cpp
-SOURCE	structure/XHTMLTitleElementHandler.cpp
+SOURCE	Structure/XHTMLHeadElementHandler.cpp
+SOURCE	Structure/XHTMLStructureModule.cpp
+SOURCE	Structure/XHTMLTitleElementHandler.cpp
 //SOURCE	structure/scriptElementHandler.cpp
-SOURCE	structure/noscriptElementHandler.cpp
-SOURCE	text/XHTMLBrElementHandler.cpp
-SOURCE	text/XHTMLCoreTextElementHandler.cpp
-SOURCE	text/XHTMLHrElementHandler.cpp
-SOURCE	text/XHTMLQElementHandler.cpp
-SOURCE	text/XHTMLTextModule1.cpp
-SOURCE	text/XHTMLTextModule2.cpp
-SOURCE	hypertext/XHTMLAElementHandler.cpp
-SOURCE	hypertext/XHTMLHypertextModule.cpp
-SOURCE	basicforms/XHTMLBasicFormsModule.cpp
-SOURCE	basicforms/XHTMLFormElementHandler.cpp
-SOURCE	basicforms/XHTMLInputElementHandler.cpp
-SOURCE	basicforms/XHTMLLabelElementHandler.cpp
-SOURCE	basicforms/XHTMLOptionElementHandler.cpp
-SOURCE	basicforms/XHTMLSelectElementHandler.cpp
-SOURCE	basicforms/XHTMLTextareaElementHandler.cpp
-SOURCE	basicforms/XHTMLControlSet.cpp
-SOURCE	basicforms/XHTMLFormLiaison.cpp
-SOURCE	basictables/XHTMLBasicTablesModule.cpp
-SOURCE	basictables/XHTMLCaptionElementHandler.cpp
-SOURCE  basictables/XHTMLCellElementHandler.cpp
-SOURCE  basictables/XHTMLRowgroupElementHandler.cpp
-SOURCE	basictables/XHTMLTableElementHandler.cpp
-SOURCE	basictables/XHTMLTableElementHandlerOOC.cpp
-SOURCE	basictables/XHTMLTrElementHandler.cpp
-SOURCE	image/areaElementHandler.cpp
-SOURCE	image/XHTMLImageModule.cpp
-SOURCE	image/imgElementHandler.cpp
-SOURCE	image/mapElementHandler.cpp
-SOURCE	image/MapElementList.cpp
-SOURCE  image/ImageMapPopup.cpp
-SOURCE	metainformation/XHTMLMetaElementHandler.cpp
-SOURCE	metainformation/XHTMLMetaInformationModule.cpp
-SOURCE	link/XHTMLLinkElementHandler.cpp
-SOURCE	link/XHTMLLinkModule.cpp
-SOURCE	base/XHTMLBASEElementHandler.cpp
-SOURCE	base/XHTMLBaseModule.cpp
-SOURCE	style/XHTMLStyleElementHandler.cpp
-SOURCE	style/XHTMLStyleModule.cpp
+SOURCE	Structure/noscriptElementHandler.cpp
+SOURCE	Text/XHTMLBrElementHandler.cpp
+SOURCE	Text/XHTMLCoreTextElementHandler.cpp
+SOURCE	Text/XHTMLHrElementHandler.cpp
+SOURCE	Text/XHTMLQElementHandler.cpp
+SOURCE	Text/XHTMLTextModule1.cpp
+SOURCE	Text/XHTMLTextModule2.cpp
+SOURCE	Hypertext/XHTMLAElementHandler.cpp
+SOURCE	Hypertext/XHTMLHypertextModule.cpp
+SOURCE	BasicForms/XHTMLBasicFormsModule.cpp
+SOURCE	BasicForms/XHTMLFormElementHandler.cpp
+SOURCE	BasicForms/XHTMLInputElementHandler.cpp
+SOURCE	BasicForms/XHTMLLabelElementHandler.cpp
+SOURCE	BasicForms/XHTMLOptionElementHandler.cpp
+SOURCE	BasicForms/XHTMLSelectElementHandler.cpp
+SOURCE	BasicForms/XHTMLTextareaElementHandler.cpp
+SOURCE	BasicForms/XHTMLControlSet.cpp
+SOURCE	BasicForms/XHTMLFormLiaison.cpp
+SOURCE	BasicTables/XHTMLBasicTablesModule.cpp
+SOURCE	BasicTables/XHTMLCaptionElementHandler.cpp
+SOURCE  BasicTables/XHTMLCellElementHandler.cpp
+SOURCE  BasicTables/XHTMLRowgroupElementHandler.cpp
+SOURCE	BasicTables/XHTMLTableElementHandler.cpp
+SOURCE	BasicTables/XHTMLTableElementHandlerOOC.cpp
+SOURCE	BasicTables/XHTMLTrElementHandler.cpp
+SOURCE	Image/areaElementHandler.cpp
+SOURCE	Image/XHTMLImageModule.cpp
+SOURCE	Image/imgElementHandler.cpp
+SOURCE	Image/mapElementHandler.cpp
+SOURCE	Image/MapElementList.cpp
+SOURCE  Image/ImageMapPopup.cpp
+SOURCE	MetaInformation/XHTMLMetaElementHandler.cpp
+SOURCE	MetaInformation/XHTMLMetaInformationModule.cpp
+SOURCE	Link/XHTMLLinkElementHandler.cpp
+SOURCE	Link/XHTMLLinkModule.cpp
+SOURCE	Base/XHTMLBaseElementHandler.cpp
+SOURCE	Base/XHTMLBaseModule.cpp
+SOURCE	Style/XHTMLStyleElementHandler.cpp
+SOURCE	Style/XHTMLStyleModule.cpp
 SOURCE	XHTMLAttributePropertyTable.cpp
 SOURCE  XHTMLPiElementHandler.cpp
 SOURCE  SaveToPhoneBkEvent.c
@@ -85,10 +85,10 @@
 SOURCE	XHTMLContentHandler.cpp
 SOURCE	XHTMLEpoc32ContentHandler.cpp
 SOURCE	XHTMLEntitySet.c
-SOURCE	frame/XHTMLFramesetElementHandler.cpp
-SOURCE  frame/XHTMLFrameModule.cpp
-SOURCE  frame/XHTMLFrameElementHandler.cpp
-SOURCE  ignore/XHTMLIgnoreElementHandler.cpp
+SOURCE	Frame/XHTMLFramesetElementHandler.cpp
+SOURCE  Frame/XHTMLFrameModule.cpp
+SOURCE  Frame/XHTMLFrameElementHandler.cpp
+SOURCE  Ignore/XHTMLIgnoreElementHandler.cpp
 SOURCE  XHTMLMessageListener.cpp
 
 
@@ -105,10 +105,10 @@
 USERINCLUDE     ../../src/lmgr/include
 USERINCLUDE     ../../src/markup/include
 USERINCLUDE     ../../src/Msg/include
-USERINCLUDE     ../../src/mvc/include
+USERINCLUDE     ../../src/MVC/include
 USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/scrolling/inc
-USERINCLUDE     ../../src/system/include
+USERINCLUDE     ../../src/Scrolling/inc
+USERINCLUDE     ../../src/System/include
 USERINCLUDE     ../../src/text/include
 USERINCLUDE     ../../src/wmlscriptch/include
 USERINCLUDE     ../../src/xhtml/include