From ec64e46d20d634d6ddf5aaa82336b62ee78deb59 Mon Sep 17 00:00:00 2001
From: Lukasz Byczynski <lukas@brodline.com>
Date: Sun, 7 Dec 2014 23:38:44 +0100
Subject: [PATCH] Fixes: #4 - Move components from package to own classes

---
 .idea/codeStyleSettings.xml                   | 10 +++
 .../SBT___scala_compiler_bundle_2_10_4.xml    | 11 +++
 .../SBT__com_vaadin_vaadin_server_7_3_6.xml   |  4 +-
 .../SBT__com_vaadin_vaadin_shared_7_3_6.xml   |  4 +-
 ...T__org_scala_lang_scala_library_2_10_4.xml |  9 +++
 .idea/modules.xml                             |  2 +
 .idea/sbt.xml                                 |  8 +-
 addon/project/.idea/modules/project-build.iml | 68 ++++++++++++++++
 addon/project/.idea/modules/project.iml       | 33 ++++++++
 .../vaadin/addons/rinne/VAbsoluteLayout.scala | 13 ++++
 .../org/vaadin/addons/rinne/VAccordion.scala  |  6 ++
 .../ButtonMixin.scala => VButton.scala}       |  8 +-
 .../org/vaadin/addons/rinne/VCheckBox.scala   | 13 ++++
 .../ComboBoxMixin.scala => VComboBox.scala}   |  9 +--
 .../org/vaadin/addons/rinne/VCssLayout.scala  | 25 ++++++
 .../addons/rinne/VCustomComponent.scala       | 17 ++++
 .../vaadin/addons/rinne/VCustomField.scala    | 12 +++
 .../org/vaadin/addons/rinne/VDateField.scala  |  5 ++
 .../org/vaadin/addons/rinne/VFormLayout.scala |  6 ++
 ...ridLayoutMixin.scala => VGridLayout.scala} | 21 +++--
 .../addons/rinne/VHorizontalLayout.scala      |  6 ++
 .../addons/rinne/VHorizontalSplitPanel.scala  |  6 ++
 .../org/vaadin/addons/rinne/VImage.scala      |  6 ++
 .../{mixins/LabelMixin.scala => VLabel.scala} |  5 +-
 .../org/vaadin/addons/rinne/VListSelect.scala | 13 ++++
 .../org/vaadin/addons/rinne/VMenuBar.scala    |  6 ++
 ...eButtonMixin.scala => VNativeButton.scala} |  8 +-
 .../org/vaadin/addons/rinne/VPanel.scala      |  5 ++
 .../vaadin/addons/rinne/VPasswordField.scala  |  7 ++
 ...FieldMixin.scala => VPopupDateField.scala} |  6 +-
 ...extAreaMixin.scala => VRichTextArea.scala} |  5 +-
 .../org/vaadin/addons/rinne/VTabSheet.scala   |  5 ++
 .../{mixins/TableMixin.scala => VTable.scala} |  9 ++-
 .../TextAreaMixin.scala => VTextArea.scala}   |  5 +-
 .../org/vaadin/addons/rinne/VTextField.scala  |  7 ++
 .../vaadin/addons/rinne/VVerticalLayout.scala |  7 ++
 .../addons/rinne/VVerticalSplitPanel.scala    |  6 ++
 .../WindowMixin.scala => VWindow.scala}       |  8 +-
 .../rinne/mixins/AbsoluteLayoutMixin.scala    | 12 ---
 .../addons/rinne/mixins/CheckBoxMixin.scala   | 10 ---
 .../vaadin/addons/rinne/mixins/CssMixin.scala | 24 ------
 .../addons/rinne/mixins/DateFieldMixin.scala  |  5 +-
 .../addons/rinne/mixins/ListSelectMixin.scala | 12 ---
 .../addons/rinne/mixins/PanelMixin.scala      |  8 +-
 .../addons/rinne/mixins/TabSheetMixin.scala   |  2 +-
 .../org/vaadin/addons/rinne/package.scala     | 78 +------------------
 46 files changed, 371 insertions(+), 184 deletions(-)
 create mode 100644 .idea/codeStyleSettings.xml
 create mode 100644 .idea/libraries/SBT___scala_compiler_bundle_2_10_4.xml
 create mode 100644 .idea/libraries/SBT__org_scala_lang_scala_library_2_10_4.xml
 create mode 100644 addon/project/.idea/modules/project-build.iml
 create mode 100644 addon/project/.idea/modules/project.iml
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VAbsoluteLayout.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VAccordion.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/ButtonMixin.scala => VButton.scala} (86%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VCheckBox.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/ComboBoxMixin.scala => VComboBox.scala} (78%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VCssLayout.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VCustomComponent.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VCustomField.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VDateField.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VFormLayout.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/GridLayoutMixin.scala => VGridLayout.scala} (59%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalLayout.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalSplitPanel.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VImage.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/LabelMixin.scala => VLabel.scala} (68%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VListSelect.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VMenuBar.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/NativeButtonMixin.scala => VNativeButton.scala} (81%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VPanel.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VPasswordField.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/PopupDateFieldMixin.scala => VPopupDateField.scala} (59%)
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/RichTextAreaMixin.scala => VRichTextArea.scala} (71%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VTabSheet.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/TableMixin.scala => VTable.scala} (97%)
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/TextAreaMixin.scala => VTextArea.scala} (58%)
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VTextField.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VVerticalLayout.scala
 create mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/VVerticalSplitPanel.scala
 rename addon/src/main/scala/org/vaadin/addons/rinne/{mixins/WindowMixin.scala => VWindow.scala} (92%)
 delete mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/mixins/AbsoluteLayoutMixin.scala
 delete mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/mixins/CheckBoxMixin.scala
 delete mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/mixins/CssMixin.scala
 delete mode 100644 addon/src/main/scala/org/vaadin/addons/rinne/mixins/ListSelectMixin.scala

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..05b8113
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
+
diff --git a/.idea/libraries/SBT___scala_compiler_bundle_2_10_4.xml b/.idea/libraries/SBT___scala_compiler_bundle_2_10_4.xml
new file mode 100644
index 0000000..e5e23a3
--- /dev/null
+++ b/.idea/libraries/SBT___scala_compiler_bundle_2_10_4.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="SBT:: scala-compiler-bundle:2.10.4">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-compiler.jar!/" />
+      <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-library.jar!/" />
+      <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-reflect.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/SBT__com_vaadin_vaadin_server_7_3_6.xml b/.idea/libraries/SBT__com_vaadin_vaadin_server_7_3_6.xml
index 878186c..022760a 100644
--- a/.idea/libraries/SBT__com_vaadin_vaadin_server_7_3_6.xml
+++ b/.idea/libraries/SBT__com_vaadin_vaadin_server_7_3_6.xml
@@ -4,6 +4,8 @@
       <root url="jar://$USER_HOME$/.ivy2/cache/com.vaadin/vaadin-server/jars/vaadin-server-7.3.6.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.ivy2/cache/com.vaadin/vaadin-server/jars/vaadin-server-7.3.6.jar!/" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/SBT__com_vaadin_vaadin_shared_7_3_6.xml b/.idea/libraries/SBT__com_vaadin_vaadin_shared_7_3_6.xml
index b2f0384..a0e1be9 100644
--- a/.idea/libraries/SBT__com_vaadin_vaadin_shared_7_3_6.xml
+++ b/.idea/libraries/SBT__com_vaadin_vaadin_shared_7_3_6.xml
@@ -4,6 +4,8 @@
       <root url="jar://$USER_HOME$/.ivy2/cache/com.vaadin/vaadin-shared/jars/vaadin-shared-7.3.6.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.ivy2/cache/com.vaadin/vaadin-shared/jars/vaadin-shared-7.3.6.jar!/" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/SBT__org_scala_lang_scala_library_2_10_4.xml b/.idea/libraries/SBT__org_scala_lang_scala_library_2_10_4.xml
new file mode 100644
index 0000000..fc1afc1
--- /dev/null
+++ b/.idea/libraries/SBT__org_scala_lang_scala_library_2_10_4.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="SBT: org.scala-lang:scala-library:2.10.4">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-library.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b56a5fd..d36c30a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,6 +6,8 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/addon-build.iml" filepath="$PROJECT_DIR$/.idea/modules/addon-build.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/demo.iml" filepath="$PROJECT_DIR$/.idea/modules/demo.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/demo-build.iml" filepath="$PROJECT_DIR$/.idea/modules/demo-build.iml" />
+      <module fileurl="file://$PROJECT_DIR$/addon/project/.idea/modules/project.iml" filepath="$PROJECT_DIR$/addon/project/.idea/modules/project.iml" />
+      <module fileurl="file://$PROJECT_DIR$/addon/project/.idea/modules/project-build.iml" filepath="$PROJECT_DIR$/addon/project/.idea/modules/project-build.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/root.iml" filepath="$PROJECT_DIR$/.idea/modules/root.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/root-build.iml" filepath="$PROJECT_DIR$/.idea/modules/root-build.iml" />
     </modules>
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
index dda2be3..9fef295 100644
--- a/.idea/sbt.xml
+++ b/.idea/sbt.xml
@@ -7,12 +7,8 @@
         <option name="jdk" value="1.7" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/addon" />
-            <option value="$PROJECT_DIR$/addon/project" />
-            <option value="$PROJECT_DIR$/demo" />
-            <option value="$PROJECT_DIR$/demo/project" />
-            <option value="$PROJECT_DIR$/project" />
+            <option value="$PROJECT_DIR$/addon/project/project/project/project/project/project" />
+            <option value="$PROJECT_DIR$/addon/project/project/project/project/project/project/project" />
           </set>
         </option>
         <option name="useAutoImport" value="true" />
diff --git a/addon/project/.idea/modules/project-build.iml b/addon/project/.idea/modules/project-build.iml
new file mode 100644
index 0000000..0b623ae
--- /dev/null
+++ b/addon/project/.idea/modules/project-build.iml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$/../../project/project/project/project/project/project" external.root.project.path="$MODULE_DIR$/../../project/project/project/project/project" external.system.id="SBT" sbt.imports="sbt._, Keys._, _root_.sbt.plugins.IvyPlugin, _root_.sbt.plugins.JvmPlugin, _root_.sbt.plugins.CorePlugin, _root_.sbt.plugins.JUnitXmlReportPlugin" type="SBT_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../project/project/project/project/project/project/target/idea-classes" />
+    <output-test url="file://$MODULE_DIR$/../../project/project/project/project/project/project/target/idea-test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../project/project/project/project/project/project">
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/project" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/project/project/target" />
+      <excludeFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/project/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="SBT: sbt-and-plugins">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/xsbti/interface-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-compiler.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/jline.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/logging-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/command-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/testing-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/persist-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/completion-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/run-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/compiler-ivy-integration-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/apply-macro-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/tasks-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/test-agent-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/process-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/main-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/tracking-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/collections-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/logic-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/classpath-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/compiler-integration-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/classfile-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/task-system-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/relation-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/cross-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-library.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/scala-reflect.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/compile-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/main-settings-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/sbt-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/sbinary_2.10-0.4.2.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/jsch-0.1.46.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/incremental-compiler-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/lib/jansi.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/cache-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/ivy-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/test-interface-1.0.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/scala-reflect-2.10.4.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/jline-2.11.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/actions-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/ivy-2.3.0.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/io-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/control-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/api-0.13.5.jar!/" />
+          <root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.4/org.scala-sbt/sbt/0.13.5/launcher-interface-0.13.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
+
diff --git a/addon/project/.idea/modules/project.iml b/addon/project/.idea/modules/project.iml
new file mode 100644
index 0000000..ab010e1
--- /dev/null
+++ b/addon/project/.idea/modules/project.iml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$/../../project/project/project/project/project" external.root.project.path="$MODULE_DIR$/../../project/project/project/project/project" external.system.id="SBT" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="scala" name="Scala">
+      <configuration>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="SBT:: scala-compiler-bundle:2.10.4" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../project/project/project/project/project/target/scala-2.10/classes" />
+    <output-test url="file://$MODULE_DIR$/../../project/project/project/project/project/target/scala-2.10/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../project/project/project/project/project">
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/target/scala-2.10/src_managed/main" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/src/main/scala" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/target/scala-2.10/src_managed/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/src/test/scala" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/target/scala-2.10/resource_managed/main" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/target/scala-2.10/resource_managed/test" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/../../project/project/project/project/project/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="SBT: org.scala-lang:scala-library:2.10.4" level="project" />
+  </component>
+</module>
+
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VAbsoluteLayout.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VAbsoluteLayout.scala
new file mode 100644
index 0000000..07ea869
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VAbsoluteLayout.scala
@@ -0,0 +1,13 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.{AbsoluteLayout, Component}
+import org.vaadin.addons.rinne.mixins.AbstractLayoutMixin
+
+class VAbsoluteLayout extends AbsoluteLayout with AbstractLayoutMixin {
+
+  def add[C <: Component](component: C, location: String): C = {
+    addComponent(component, location)
+    component
+  }
+
+}
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VAccordion.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VAccordion.scala
new file mode 100644
index 0000000..4785832
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VAccordion.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.Accordion
+import org.vaadin.addons.rinne.mixins.TabSheetMixin
+
+class VAccordion extends Accordion with TabSheetMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ButtonMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VButton.scala
similarity index 86%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/ButtonMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VButton.scala
index 0398450..8d27b80 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ButtonMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VButton.scala
@@ -1,12 +1,12 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
-import org.vaadin.addons.rinne.KeyShortcut
-import org.vaadin.addons.rinne.events._
 import com.vaadin.ui.Button
+import org.vaadin.addons.rinne.events._
+import org.vaadin.addons.rinne.mixins.{AbstractComponentMixin, FocusableMixin}
 
 import scala.collection.JavaConverters._
 
-trait ButtonMixin extends Button with AbstractComponentMixin with BlurNotifier with FocusNotifier with FocusableMixin {
+class VButton extends Button with AbstractComponentMixin with BlurNotifier with FocusNotifier with FocusableMixin {
 
   private var _clickKeyShortcut: Option[KeyShortcut] = None
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VCheckBox.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VCheckBox.scala
new file mode 100644
index 0000000..74e0ea4
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VCheckBox.scala
@@ -0,0 +1,13 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.CheckBox
+import org.vaadin.addons.rinne.mixins.AbstractFieldMixin
+
+class VCheckBox extends CheckBox with AbstractFieldMixin[java.lang.Boolean] {
+
+  def value_=(value: Boolean) {
+    setValue(value)
+  }
+
+  def boolValue: Boolean = getValue
+}
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ComboBoxMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VComboBox.scala
similarity index 78%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/ComboBoxMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VComboBox.scala
index 77507d4..6196d4c 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ComboBoxMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VComboBox.scala
@@ -1,11 +1,10 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
-import org.vaadin.addons.rinne.converters.Converters
 import com.vaadin.shared.ui.combobox.FilteringMode
+import com.vaadin.ui.ComboBox
+import org.vaadin.addons.rinne.mixins.{ContainerMixin, ComponentMixin, AbstractSelectMixin}
 
-trait ComboBoxMixin extends com.vaadin.ui.ComboBox with AbstractSelectMixin with ContainerMixin with SizeableMixin {
-
-  setConverter(Converters.optionToAny)
+class VComboBox extends ComboBox with AbstractSelectMixin with ContainerMixin {
 
   def inputPrompt: Option[String] = Option(getInputPrompt)
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VCssLayout.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VCssLayout.scala
new file mode 100644
index 0000000..49703f0
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VCssLayout.scala
@@ -0,0 +1,25 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.{Component, CssLayout}
+import org.vaadin.addons.rinne.events.LayoutClickNotifierMixin
+import org.vaadin.addons.rinne.mixins.AbstractLayoutMixin
+
+class VCssLayout extends CssLayout with AbstractLayoutMixin with LayoutClickNotifierMixin {
+
+  private var _cssMap = Map.empty[Component, String]
+
+  def add[C <: Component](component: C, css: => String = null): C = {
+    add(component)
+    if (css != null) {
+      _cssMap += component -> css
+    }
+    component
+  }
+
+  override def getCss(component: Component): String = _cssMap.getOrElse(component, "")
+
+  override def removeComponent(component: Component) = {
+    super.removeComponent(component)
+    _cssMap -= component
+  }
+}
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VCustomComponent.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VCustomComponent.scala
new file mode 100644
index 0000000..91458e6
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VCustomComponent.scala
@@ -0,0 +1,17 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.{Component, CustomComponent}
+import org.vaadin.addons.rinne.mixins.ComponentMixin
+
+class VCustomComponent extends CustomComponent with ComponentMixin {
+
+  def compositionRoot: Option[Component] = Option(getCompositionRoot)
+
+  def compositionRoot_=(component: Component) {
+    setCompositionRoot(component)
+  }
+
+  def compositionRoot_=(component: Option[Component]) {
+    setCompositionRoot(component.orNull)
+  }
+}
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VCustomField.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VCustomField.scala
new file mode 100644
index 0000000..b4672e2
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VCustomField.scala
@@ -0,0 +1,12 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.CustomField
+import org.vaadin.addons.rinne.mixins.AbstractFieldMixin
+
+import scala.reflect._
+
+abstract class VCustomField[T: ClassTag] extends CustomField[T] with AbstractFieldMixin[T] {
+  private val _type = classTag[T].runtimeClass.asInstanceOf[Class[_ <: T]]
+
+  override def getType: Class[_ <: T] = _type
+}
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VDateField.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VDateField.scala
new file mode 100644
index 0000000..05fb902
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VDateField.scala
@@ -0,0 +1,5 @@
+package org.vaadin.addons.rinne
+
+import org.vaadin.addons.rinne.mixins.DateFieldMixin
+
+class VDateField extends DateFieldMixin
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VFormLayout.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VFormLayout.scala
new file mode 100644
index 0000000..232356a
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VFormLayout.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.FormLayout
+import org.vaadin.addons.rinne.mixins.AbstractOrderedLayoutMixin
+
+class VFormLayout extends FormLayout with AbstractOrderedLayoutMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/GridLayoutMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VGridLayout.scala
similarity index 59%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/GridLayoutMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VGridLayout.scala
index 8df881c..ff94473 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/GridLayoutMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VGridLayout.scala
@@ -1,8 +1,9 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
 import com.vaadin.ui.{Alignment, Component, GridLayout}
+import org.vaadin.addons.rinne.mixins.{AbstractLayoutMixin, MarginHandlerMixin, SpacingHandlerMixin}
 
-trait GridLayoutMixin extends GridLayout with AbstractLayoutMixin with SpacingHandlerMixin with MarginHandlerMixin {
+class VGridLayout extends GridLayout with AbstractLayoutMixin with SpacingHandlerMixin with MarginHandlerMixin {
 
   def add[C <: Component](
     component: C = null,
@@ -29,18 +30,26 @@ trait GridLayoutMixin extends GridLayout with AbstractLayoutMixin with SpacingHa
 
   def columns: Int = getColumns
 
-  def columns_=(columns: Int) { setColumns(columns) }
+  def columns_=(columns: Int) {
+    setColumns(columns)
+  }
 
   def rows: Int = getRows
 
-  def rows_=(rows: Int) { setRows(rows) }
+  def rows_=(rows: Int) {
+    setRows(rows)
+  }
 
   def cursorX: Int = getCursorX
 
-  def cursorX_=(cursorX: Int) { setCursorX(cursorX) }
+  def cursorX_=(cursorX: Int) {
+    setCursorX(cursorX)
+  }
 
   def cursorY: Int = getCursorY
 
-  def cursorY_=(cursorY: Int) { setCursorY(cursorY) }
+  def cursorY_=(cursorY: Int) {
+    setCursorY(cursorY)
+  }
 
 }
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalLayout.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalLayout.scala
new file mode 100644
index 0000000..7e63bda
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalLayout.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.HorizontalLayout
+import org.vaadin.addons.rinne.mixins.AbstractOrderedLayoutMixin
+
+class VHorizontalLayout extends HorizontalLayout with AbstractOrderedLayoutMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalSplitPanel.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalSplitPanel.scala
new file mode 100644
index 0000000..98544c1
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VHorizontalSplitPanel.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.HorizontalSplitPanel
+import org.vaadin.addons.rinne.mixins.AbstractSplitPanelMixin
+
+class VHorizontalSplitPanel extends HorizontalSplitPanel with AbstractSplitPanelMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VImage.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VImage.scala
new file mode 100644
index 0000000..bd41d51
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VImage.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.Image
+import org.vaadin.addons.rinne.mixins.AbstractEmbeddedMixin
+
+class VImage extends Image with AbstractEmbeddedMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/LabelMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VLabel.scala
similarity index 68%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/LabelMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VLabel.scala
index e869025..730f2d8 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/LabelMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VLabel.scala
@@ -1,10 +1,11 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
 import com.vaadin.data.util.converter.Converter
 import com.vaadin.shared.ui.label.ContentMode
 import com.vaadin.ui.Label
+import org.vaadin.addons.rinne.mixins.{AbstractComponentMixin, PropertyMixin}
 
-trait LabelMixin extends Label with AbstractComponentMixin with PropertyMixin[String] {
+class VLabel extends Label with AbstractComponentMixin with PropertyMixin[String] {
 
   def contentMode: ContentMode = getContentMode
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VListSelect.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VListSelect.scala
new file mode 100644
index 0000000..c1a4af7
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VListSelect.scala
@@ -0,0 +1,13 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.ListSelect
+import org.vaadin.addons.rinne.mixins.{AbstractSelectMixin, MultiSelectableMixin}
+
+class VListSelect extends ListSelect with AbstractSelectMixin with MultiSelectableMixin {
+
+  def rows: Int = getRows
+
+  def rows_=(rows: Int) {
+    setRows(rows)
+  }
+}
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VMenuBar.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VMenuBar.scala
new file mode 100644
index 0000000..e59ded9
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VMenuBar.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.MenuBar
+import org.vaadin.addons.rinne.mixins.AbstractComponentMixin
+
+class VMenuBar extends MenuBar with AbstractComponentMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/NativeButtonMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VNativeButton.scala
similarity index 81%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/NativeButtonMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VNativeButton.scala
index ea55013..ea11d32 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/NativeButtonMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VNativeButton.scala
@@ -1,10 +1,10 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
-import org.vaadin.addons.rinne.KeyShortcut
+import com.vaadin.ui.{Button, NativeButton}
 import org.vaadin.addons.rinne.events._
-import com.vaadin.ui.{NativeButton, Button}
+import org.vaadin.addons.rinne.mixins.{AbstractComponentMixin, FocusableMixin}
 
-trait NativeButtonMixin extends NativeButton with AbstractComponentMixin with BlurNotifier with FocusNotifier with FocusableMixin {
+class VNativeButton extends NativeButton with AbstractComponentMixin with BlurNotifier with FocusNotifier with FocusableMixin {
 
   private var _clickKeyShortcut: Option[KeyShortcut] = None
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VPanel.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VPanel.scala
new file mode 100644
index 0000000..1a880ee
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VPanel.scala
@@ -0,0 +1,5 @@
+package org.vaadin.addons.rinne
+
+import org.vaadin.addons.rinne.mixins.PanelMixin
+
+class VPanel extends PanelMixin
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VPasswordField.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VPasswordField.scala
new file mode 100644
index 0000000..c5e1f2e
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VPasswordField.scala
@@ -0,0 +1,7 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.PasswordField
+import org.vaadin.addons.rinne.mixins.AbstractTextFieldMixin
+
+class VPasswordField extends PasswordField with AbstractTextFieldMixin
+
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/PopupDateFieldMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VPopupDateField.scala
similarity index 59%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/PopupDateFieldMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VPopupDateField.scala
index f17d178..761f428 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/PopupDateFieldMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VPopupDateField.scala
@@ -1,9 +1,9 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
-import org.vaadin.addons.rinne.converters.Converters
 import com.vaadin.ui.PopupDateField
+import org.vaadin.addons.rinne.mixins.DateFieldMixin
 
-trait PopupDateFieldMixin extends PopupDateField with DateFieldMixin {
+class VPopupDateField extends PopupDateField with DateFieldMixin {
 
   def prompt: Option[String] = Option(getInputPrompt)
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/RichTextAreaMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VRichTextArea.scala
similarity index 71%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/RichTextAreaMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VRichTextArea.scala
index b8686a7..85636d5 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/RichTextAreaMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VRichTextArea.scala
@@ -1,8 +1,9 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
 import com.vaadin.ui.RichTextArea
+import org.vaadin.addons.rinne.mixins.AbstractFieldMixin
 
-trait RichTextAreaMixin extends RichTextArea with AbstractFieldMixin[String] {
+class VRichTextArea extends RichTextArea with AbstractFieldMixin[String] {
 
   nullRepresentation = ""
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VTabSheet.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VTabSheet.scala
new file mode 100644
index 0000000..af406a9
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VTabSheet.scala
@@ -0,0 +1,5 @@
+package org.vaadin.addons.rinne
+
+import org.vaadin.addons.rinne.mixins.TabSheetMixin
+
+class VTabSheet extends TabSheetMixin
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TableMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VTable.scala
similarity index 97%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/TableMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VTable.scala
index fbdd4c2..de20123 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TableMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VTable.scala
@@ -1,14 +1,15 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
-import org.vaadin.addons.rinne.SelectionMode
-import org.vaadin.addons.rinne.events._
 import com.vaadin.server.Resource
 import com.vaadin.shared.ui.MultiSelectMode
 import com.vaadin.ui.Table
+import org.vaadin.addons.rinne.events._
+import org.vaadin.addons.rinne.mixins.AbstractSelectMixin
+
 import scala.collection.mutable
 
 
-trait TableMixin extends Table with AbstractSelectMixin with ItemClickNotifier {
+class VTable extends Table with AbstractSelectMixin with ItemClickNotifier {
 
   private val _columnGeneratorIds: mutable.Set[Any] = mutable.Set.empty[Any]
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TextAreaMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VTextArea.scala
similarity index 58%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/TextAreaMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VTextArea.scala
index 38a9d60..4377e6c 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TextAreaMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VTextArea.scala
@@ -1,8 +1,9 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
 import com.vaadin.ui.TextArea
+import org.vaadin.addons.rinne.mixins.AbstractTextFieldMixin
 
-trait TextAreaMixin extends TextArea with AbstractTextFieldMixin {
+class VTextArea extends TextArea with AbstractTextFieldMixin {
   def rows: Int = getRows
 
   def rows_=(rows: Int) {
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VTextField.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VTextField.scala
new file mode 100644
index 0000000..26b8c3c
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VTextField.scala
@@ -0,0 +1,7 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.TextField
+import org.vaadin.addons.rinne.mixins.AbstractTextFieldMixin
+
+class VTextField extends TextField with AbstractTextFieldMixin
+
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VVerticalLayout.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VVerticalLayout.scala
new file mode 100644
index 0000000..bafe418
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VVerticalLayout.scala
@@ -0,0 +1,7 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.VerticalLayout
+import org.vaadin.addons.rinne.mixins.AbstractOrderedLayoutMixin
+
+class VVerticalLayout extends VerticalLayout with AbstractOrderedLayoutMixin
+
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/VVerticalSplitPanel.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VVerticalSplitPanel.scala
new file mode 100644
index 0000000..5019e8c
--- /dev/null
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VVerticalSplitPanel.scala
@@ -0,0 +1,6 @@
+package org.vaadin.addons.rinne
+
+import com.vaadin.ui.VerticalSplitPanel
+import org.vaadin.addons.rinne.mixins.AbstractSplitPanelMixin
+
+class VVerticalSplitPanel extends VerticalSplitPanel with AbstractSplitPanelMixin
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/WindowMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/VWindow.scala
similarity index 92%
rename from addon/src/main/scala/org/vaadin/addons/rinne/mixins/WindowMixin.scala
rename to addon/src/main/scala/org/vaadin/addons/rinne/VWindow.scala
index 409eb56..d67c054 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/WindowMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/VWindow.scala
@@ -1,10 +1,10 @@
-package org.vaadin.addons.rinne.mixins
+package org.vaadin.addons.rinne
 
-import org.vaadin.addons.rinne.KeyShortcut
-import org.vaadin.addons.rinne.events._
 import com.vaadin.ui.Window
+import org.vaadin.addons.rinne.events._
+import org.vaadin.addons.rinne.mixins.PanelMixin
 
-trait WindowMixin extends Window with PanelMixin with BlurNotifier with FocusNotifier {
+class VWindow extends Window with PanelMixin with BlurNotifier with FocusNotifier {
 
   private var _closeKeyShortcut: Option[KeyShortcut] = None
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/AbsoluteLayoutMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/AbsoluteLayoutMixin.scala
deleted file mode 100644
index 57d3b3e..0000000
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/AbsoluteLayoutMixin.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.vaadin.addons.rinne.mixins
-
-import com.vaadin.ui.{Component, AbsoluteLayout}
-
-trait AbsoluteLayoutMixin extends AbsoluteLayout with AbstractLayoutMixin {
-
-  def add[C <: Component](component: C, location: String): C = {
-    addComponent(component, location)
-    component
-  }
-
-}
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/CheckBoxMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/CheckBoxMixin.scala
deleted file mode 100644
index 2c9825a..0000000
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/CheckBoxMixin.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.vaadin.addons.rinne.mixins
-
-trait CheckBoxMixin extends AbstractFieldMixin[java.lang.Boolean] {
-
-  def value_=(value: Boolean) {
-    setValue(value)
-  }
-
-  def boolValue: Boolean = getValue
-}
\ No newline at end of file
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/CssMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/CssMixin.scala
deleted file mode 100644
index ae38ffd..0000000
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/CssMixin.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.vaadin.addons.rinne.mixins
-
-import org.vaadin.addons.rinne.events.LayoutClickNotifierMixin
-import com.vaadin.ui.CssLayout
-
-trait CssMixin extends CssLayout with AbstractLayoutMixin with LayoutClickNotifierMixin {
-
-  private var _cssMap = Map.empty[com.vaadin.ui.Component, String]
-
-  def add[C <: com.vaadin.ui.Component](component: C, css: => String = null): C = {
-    add(component)
-    if (css != null) {
-      _cssMap += component -> css
-    }
-    component
-  }
-
-  override def getCss(component: com.vaadin.ui.Component): String = _cssMap.getOrElse(component, "")
-
-  override def removeComponent(component: com.vaadin.ui.Component) = {
-    super.removeComponent(component)
-    _cssMap -= component
-  }
-}
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/DateFieldMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/DateFieldMixin.scala
index f26a46a..66d948f 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/DateFieldMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/DateFieldMixin.scala
@@ -1,9 +1,10 @@
 package org.vaadin.addons.rinne.mixins
 
-import org.vaadin.addons.rinne.events.{FocusNotifier, BlurNotifier}
+import java.util.{TimeZone, Date}
+
 import com.vaadin.shared.ui.datefield.Resolution
 import com.vaadin.ui.DateField
-import java.util.{TimeZone, Date}
+import org.vaadin.addons.rinne.events.{FocusNotifier, BlurNotifier}
 
 trait DateFieldMixin extends DateField with AbstractFieldMixin[Date] with BlurNotifier with FocusNotifier {
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ListSelectMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ListSelectMixin.scala
deleted file mode 100644
index e94aa88..0000000
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/ListSelectMixin.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.vaadin.addons.rinne.mixins
-
-import com.vaadin.ui.ListSelect
-
-trait ListSelectMixin extends ListSelect with AbstractSelectMixin with MultiSelectableMixin {
-
-  def rows: Int = getRows
-
-  def rows_=(rows: Int) {
-    setRows(rows)
-  }
-}
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/PanelMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/PanelMixin.scala
index 985a4d8..f21477e 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/PanelMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/PanelMixin.scala
@@ -6,10 +6,14 @@ trait PanelMixin extends Panel with AbstractSingleComponentContainerMixin with F
 
   def scrollLeft: Int = getScrollLeft
 
-  def scrollLeft_=(scrollLeft: Int) { setScrollLeft(scrollLeft) }
+  def scrollLeft_=(scrollLeft: Int) {
+    setScrollLeft(scrollLeft)
+  }
 
   def scrollTop: Int = getScrollTop
 
-  def scrollTop_=(scrollTop: Int) { setScrollTop(scrollTop) }
+  def scrollTop_=(scrollTop: Int) {
+    setScrollTop(scrollTop)
+  }
 
 }
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TabSheetMixin.scala b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TabSheetMixin.scala
index 6165c7c..f555f92 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TabSheetMixin.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/mixins/TabSheetMixin.scala
@@ -1,8 +1,8 @@
 package org.vaadin.addons.rinne.mixins
 
-import org.vaadin.addons.rinne.events._
 import com.vaadin.ui.Component.Focusable
 import com.vaadin.ui.{Component, TabSheet}
+import org.vaadin.addons.rinne.events._
 
 trait TabSheetMixin extends TabSheet with AbstractComponentMixin with Focusable with FocusNotifier with BlurNotifier {
 
diff --git a/addon/src/main/scala/org/vaadin/addons/rinne/package.scala b/addon/src/main/scala/org/vaadin/addons/rinne/package.scala
index 5104a81..860bd90 100644
--- a/addon/src/main/scala/org/vaadin/addons/rinne/package.scala
+++ b/addon/src/main/scala/org/vaadin/addons/rinne/package.scala
@@ -1,11 +1,6 @@
 package org.vaadin.addons
 
-import com.vaadin.ui._
-import org.vaadin.addons.rinne.MeasureExtent
-import org.vaadin.addons.rinne.mixins._
-
 import scala.language.implicitConversions
-import scala.reflect.{ClassTag, classTag}
 
 package object rinne {
 
@@ -13,75 +8,4 @@ package object rinne {
 
   implicit def doubleToMeasureOption(value: Double): MeasureExtent = new MeasureExtent(value)
 
-  abstract class VCustomField[T: ClassTag] extends CustomField[T] with AbstractFieldMixin[T] {
-    override def getType: Class[_ <: T] = classTag[T].runtimeClass.asInstanceOf[Class[_ <: T]]
-  }
-
-  class VAbsoluteLayout extends AbsoluteLayoutMixin
-
-  class VComboBox extends ComboBoxMixin
-
-  class VCssLayout extends CssMixin
-
-  class VGridLayout extends GridLayoutMixin
-
-  class VHorizontalLayout extends HorizontalLayout with AbstractOrderedLayoutMixin
-
-  class VVerticalLayout extends VerticalLayout with AbstractOrderedLayoutMixin
-
-  class VFormLayout extends FormLayout with AbstractOrderedLayoutMixin
-
-  class VLabel extends LabelMixin
-
-  class VPasswordField extends PasswordField with AbstractTextFieldMixin
-
-  class VTextField extends TextField with AbstractTextFieldMixin
-
-  class VRichTextArea extends RichTextAreaMixin
-
-  class VTextArea extends TextAreaMixin
-
-  class VWindow extends WindowMixin
-
-  class VPanel extends PanelMixin
-
-  class VButton extends ButtonMixin
-
-  class VNativeButton extends NativeButton with NativeButtonMixin
-
-  class VHorizontalSplitPanel extends HorizontalSplitPanel with AbstractSplitPanelMixin
-
-  class VVerticalSplitPanel extends VerticalSplitPanel with AbstractSplitPanelMixin
-
-  class VTable extends Table with TableMixin
-
-  class VImage extends Image with AbstractEmbeddedMixin
-
-  class VListSelect extends ListSelectMixin
-
-  class VDateField extends DateFieldMixin
-
-  class VPopupDateField extends PopupDateFieldMixin
-
-  class VTabSheet extends TabSheetMixin
-
-  class VAccordion extends Accordion with TabSheetMixin
-
-  class VCustomComponent extends CustomComponent with ComponentMixin {
-
-    def compositionRoot: Option[Component] = Option(getCompositionRoot)
-
-    def compositionRoot_=(component: Component) {
-      setCompositionRoot(component)
-    }
-
-    def compositionRoot_=(component: Option[Component]) {
-      setCompositionRoot(component.orNull)
-    }
-  }
-
-  class VCheckBox extends CheckBox with CheckBoxMixin
-
-  class VMenuBar extends MenuBar with AbstractComponentMixin
-
-}
+}
\ No newline at end of file