diff --git a/components/Button.qml b/components/Button.qml
index 885a9f0e84f24d2983045e73f613c0ab6d1a6a16..403479ad1e5c86a3f45ef6999c69573aa441d8e6 100644
--- a/components/Button.qml
+++ b/components/Button.qml
@@ -7,11 +7,14 @@ Components.Button {
     width: Math.max(80, sizehint.width)
     height: Math.max(22, sizehint.height)
 
+    property alias containsMouse: tooltip.containsMouse
     property variant sizehint: backgroundItem.sizeFromContents(80, 6)
     property bool defaultbutton
     property string hint
 
     TooltipArea {
+        // Note this will eat hover events
+        id: tooltip
         anchors.fill: parent
         text: button.tooltip
     }
diff --git a/src/styleitem/qcursorarea.cpp b/src/qcursorarea.cpp
similarity index 100%
rename from src/styleitem/qcursorarea.cpp
rename to src/qcursorarea.cpp
diff --git a/src/styleitem/qcursorarea.h b/src/qcursorarea.h
similarity index 100%
rename from src/styleitem/qcursorarea.h
rename to src/qcursorarea.h
diff --git a/src/styleitem/qdeclarativefolderlistmodel.cpp b/src/qdeclarativefolderlistmodel.cpp
similarity index 100%
rename from src/styleitem/qdeclarativefolderlistmodel.cpp
rename to src/qdeclarativefolderlistmodel.cpp
diff --git a/src/styleitem/qdeclarativefolderlistmodel.h b/src/qdeclarativefolderlistmodel.h
similarity index 100%
rename from src/styleitem/qdeclarativefolderlistmodel.h
rename to src/qdeclarativefolderlistmodel.h
diff --git a/src/styleitem/qdesktopitem.cpp b/src/qdesktopitem.cpp
similarity index 100%
rename from src/styleitem/qdesktopitem.cpp
rename to src/qdesktopitem.cpp
diff --git a/src/styleitem/qdesktopitem.h b/src/qdesktopitem.h
similarity index 100%
rename from src/styleitem/qdesktopitem.h
rename to src/qdesktopitem.h
diff --git a/src/styleitem/qrangemodel.cpp b/src/qrangemodel.cpp
similarity index 100%
rename from src/styleitem/qrangemodel.cpp
rename to src/qrangemodel.cpp
diff --git a/src/styleitem/qrangemodel.h b/src/qrangemodel.h
similarity index 100%
rename from src/styleitem/qrangemodel.h
rename to src/qrangemodel.h
diff --git a/src/styleitem/qrangemodel_p.h b/src/qrangemodel_p.h
similarity index 100%
rename from src/styleitem/qrangemodel_p.h
rename to src/qrangemodel_p.h
diff --git a/src/styleitem/qstyleitem.cpp b/src/qstyleitem.cpp
similarity index 100%
rename from src/styleitem/qstyleitem.cpp
rename to src/qstyleitem.cpp
diff --git a/src/styleitem/qstyleitem.h b/src/qstyleitem.h
similarity index 100%
rename from src/styleitem/qstyleitem.h
rename to src/qstyleitem.h
diff --git a/src/styleitem/qstyleplugin.cpp b/src/qstyleplugin.cpp
similarity index 100%
rename from src/styleitem/qstyleplugin.cpp
rename to src/qstyleplugin.cpp
diff --git a/src/styleitem/qstyleplugin.h b/src/qstyleplugin.h
similarity index 100%
rename from src/styleitem/qstyleplugin.h
rename to src/qstyleplugin.h
diff --git a/src/styleitem/qtmenu.cpp b/src/qtmenu.cpp
similarity index 100%
rename from src/styleitem/qtmenu.cpp
rename to src/qtmenu.cpp
diff --git a/src/styleitem/qtmenu.h b/src/qtmenu.h
similarity index 100%
rename from src/styleitem/qtmenu.h
rename to src/qtmenu.h
diff --git a/src/styleitem/qtmenubar.cpp b/src/qtmenubar.cpp
similarity index 100%
rename from src/styleitem/qtmenubar.cpp
rename to src/qtmenubar.cpp
diff --git a/src/styleitem/qtmenubar.h b/src/qtmenubar.h
similarity index 100%
rename from src/styleitem/qtmenubar.h
rename to src/qtmenubar.h
diff --git a/src/styleitem/qtmenuitem.cpp b/src/qtmenuitem.cpp
similarity index 100%
rename from src/styleitem/qtmenuitem.cpp
rename to src/qtmenuitem.cpp
diff --git a/src/styleitem/qtmenuitem.h b/src/qtmenuitem.h
similarity index 100%
rename from src/styleitem/qtmenuitem.h
rename to src/qtmenuitem.h
diff --git a/src/styleitem/qtooltiparea.cpp b/src/qtooltiparea.cpp
similarity index 96%
rename from src/styleitem/qtooltiparea.cpp
rename to src/qtooltiparea.cpp
index 2a1cb3e2abac70a440501c509efab1371614d59a..c560a52e22f78471443ddb5e729b509c33c4d92a 100644
--- a/src/styleitem/qtooltiparea.cpp
+++ b/src/qtooltiparea.cpp
@@ -2,6 +2,7 @@
 #include <QGraphicsView>
 #include <QToolTip>
 #include <QApplication>
+#include <QGraphicsSceneEvent>
 
 QTooltipArea::QTooltipArea(QDeclarativeItem *parent) :
     QDeclarativeItem(parent)
diff --git a/src/styleitem/qtooltiparea.h b/src/qtooltiparea.h
similarity index 100%
rename from src/styleitem/qtooltiparea.h
rename to src/qtooltiparea.h
diff --git a/src/styleitem/qtoplevelwindow.cpp b/src/qtoplevelwindow.cpp
similarity index 100%
rename from src/styleitem/qtoplevelwindow.cpp
rename to src/qtoplevelwindow.cpp
diff --git a/src/styleitem/qtoplevelwindow.h b/src/qtoplevelwindow.h
similarity index 100%
rename from src/styleitem/qtoplevelwindow.h
rename to src/qtoplevelwindow.h
diff --git a/src/styleitem/qwheelarea.cpp b/src/qwheelarea.cpp
similarity index 100%
rename from src/styleitem/qwheelarea.cpp
rename to src/qwheelarea.cpp
diff --git a/src/styleitem/qwheelarea.h b/src/qwheelarea.h
similarity index 100%
rename from src/styleitem/qwheelarea.h
rename to src/qwheelarea.h
diff --git a/src/styleitem/qwindowitem.cpp b/src/qwindowitem.cpp
similarity index 100%
rename from src/styleitem/qwindowitem.cpp
rename to src/qwindowitem.cpp
diff --git a/src/styleitem/qwindowitem.h b/src/qwindowitem.h
similarity index 100%
rename from src/styleitem/qwindowitem.h
rename to src/qwindowitem.h
diff --git a/src/src.pro b/src/src.pro
index b06387a2b9d05db8bd2148eb9d8d153481c8a316..c2689d6f01981d377e1c9723fcbe6320ac700340 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,63 @@
-TEMPLATE = subdirs
-SUBDIRS =  styleitem
+TEMPLATE = lib
+CONFIG += qt plugin
+QT += declarative
+QT += script
+ 
+TARGET  = styleplugin
+
+DESTDIR = ../components/plugin
+OBJECTS_DIR = obj
+MOC_DIR = moc
+
+HEADERS += qtmenu.h \
+           qtmenubar.h \
+           qrangemodel_p.h \
+           qrangemodel.h \
+           qstyleplugin.h \
+           qdeclarativefolderlistmodel.h \
+           qstyleitem.h \
+           qwheelarea.h \
+           qtmenuitem.h \
+           qwindowitem.h \
+           qdesktopitem.h \
+           qtoplevelwindow.h \
+           qcursorarea.h \
+           qtooltiparea.h
+
+SOURCES += qtmenu.cpp \
+           qtmenubar.cpp \
+           qrangemodel.cpp \
+           qstyleplugin.cpp \
+           qdeclarativefolderlistmodel.cpp \
+           qstyleitem.cpp \
+           qwheelarea.cpp \
+           qtmenuitem.cpp \
+           qwindowitem.cpp \
+           qdesktopitem.cpp \
+           qtoplevelwindow.cpp \
+           qcursorarea.cpp \
+           qtooltiparea.cpp
+
+TARGETPATH = QtDesktop/plugin
+
+symbian {
+    INSTALL_IMPORTS = /resource/qt/imports
+} else {
+    INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS]
+}
+           
+target.path = $$INSTALL_IMPORTS/$$TARGETPATH
+
+INSTALLS += target
+
+symbian {
+    DEPLOYMENT += target
+}
+
+
+
+
+
+
+
+
diff --git a/src/styleitem/styleitem.pro b/src/styleitem/styleitem.pro
deleted file mode 100644
index 21aba3fa4e2fd53406f68d448cd5408fd359d54d..0000000000000000000000000000000000000000
--- a/src/styleitem/styleitem.pro
+++ /dev/null
@@ -1,63 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative
-QT += script
- 
-TARGET  = styleplugin
-
-DESTDIR = ../../components/plugin
-OBJECTS_DIR = obj
-MOC_DIR = moc
-
-HEADERS += qtmenu.h \
-           qtmenubar.h \
-           qrangemodel_p.h \
-           qrangemodel.h \
-           qstyleplugin.h \
-           qdeclarativefolderlistmodel.h \
-           qstyleitem.h \
-           qwheelarea.h \
-           qtmenuitem.h \
-           qwindowitem.h \
-           qdesktopitem.h \
-           qtoplevelwindow.h \
-           qcursorarea.h \
-           qtooltiparea.h
-
-SOURCES += qtmenu.cpp \
-           qtmenubar.cpp \
-           qrangemodel.cpp \
-           qstyleplugin.cpp \
-           qdeclarativefolderlistmodel.cpp \
-           qstyleitem.cpp \
-           qwheelarea.cpp \
-           qtmenuitem.cpp \
-           qwindowitem.cpp \
-           qdesktopitem.cpp \
-           qtoplevelwindow.cpp \
-           qcursorarea.cpp \
-           qtooltiparea.cpp
-
-TARGETPATH = QtDesktop/plugin
-
-symbian {
-    INSTALL_IMPORTS = /resource/qt/imports
-} else {
-    INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS]
-}
-           
-target.path = $$INSTALL_IMPORTS/$$TARGETPATH
-
-INSTALLS += target
-
-symbian {
-    DEPLOYMENT += target
-}
-
-
-
-
-
-
-
-