diff --git a/res/layout-land/drag_button_calibration.xml b/res/layout-land/drag_button_calibration.xml
index 4ae71d79..47179e82 100644
--- a/res/layout-land/drag_button_calibration.xml
+++ b/res/layout-land/drag_button_calibration.xml
@@ -21,7 +21,7 @@
 					   a:layout_width="80dp"
 					   a:layout_height="80dp"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonLeft"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft"
 														   a:text=""
 														   calc:textUp="@string/c_up"
 														   calc:textDown="@string/c_down"
@@ -29,7 +29,7 @@
 														   a:layout_height="80dp"
 														   style="@style/digit_button_style"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
 														   a:text=""
 														   calc:textUp="@string/c_up"
 														   calc:textDown="@string/c_down"
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index 281323cd..53f8beb6 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -25,14 +25,14 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/leftButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/leftButton"
 														   calc:textUp="↞"
 														   a:text="←"
 														   a:layout_weight="1.5"
 														   style="@style/control_button_style"
 														   a:onClick="moveLeftButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/eraseButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eraseButton"
 														   a:text="↚"
 														   a:layout_weight="1.5"
 														   style="@style/control_button_style"
@@ -49,13 +49,13 @@
 					a:scrollHorizontally="true"
 					a:scrollbars="none"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/clearButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/clearButton"
 														   a:text="clear"
 														   a:layout_weight="1.5"
 														   style="@style/control_button_style"
 														   a:onClick="clearButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/rightButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/rightButton"
 														   calc:textUp="↠"
 														   a:text="→"
 														   a:layout_weight="1.5"
@@ -67,35 +67,35 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
 														   calc:textDown="asin" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
 														   calc:textDown="acos" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan"
 														   calc:textDown="atan" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×"
 														   calc:textUp="^"
 														   calc:textDown="^2" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
 														   calc:textUp="√"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/equalsButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/equalsButton"
 														   a:text="="
 														   a:layout_width="fill_parent"
 														   style="@style/control_button_style"
 														   a:onClick="numericButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/pasteButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/pasteButton"
 														   a:text="paste"
 														   style="@style/control_button_style"
 														   a:onClick="pasteButtonClickHandler"/>
@@ -104,42 +104,42 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/fourDigitButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fourDigitButton"
 														   a:text="4"
 														   calc:textUp="sinh"
 														   calc:textDown="asinh"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/fiveDigitButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fiveDigitButton"
 														   a:text="5"
 														   calc:textUp="cosh"
 														   calc:textDown="acosh"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6"
 														   calc:textUp="tanh"
 														   calc:textDown="atanh"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/plusButton" a:text="+"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/plusButton" a:text="+"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/minusButton" a:text="-"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/minusButton" a:text="-"
 														   calc:textUp="{"
 														   calc:textDown="}"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
 														   calc:textUp="["
 														   calc:textDown="]" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/historyButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/historyButton"
 														   a:text=""
 														   calc:textUp="undo"
 														   calc:textDown="redo"
@@ -149,38 +149,38 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7"
 														   calc:textUp="i"
 														   calc:textDown=""
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8"
 														   calc:textUp="ln"
 														   calc:textDown=""
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9"
 														   calc:textDown="e"
 														   calc:textUp="π"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
 														   calc:textUp="."
 														   calc:textDown=","
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
 														   calc:textUp="("
 														   calc:textDown=")" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/>
+			<org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/>
+			<org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
 
 
 		</LinearLayout>
diff --git a/res/layout-port/drag_button_calibration.xml b/res/layout-port/drag_button_calibration.xml
index 4ae71d79..47179e82 100644
--- a/res/layout-port/drag_button_calibration.xml
+++ b/res/layout-port/drag_button_calibration.xml
@@ -21,7 +21,7 @@
 					   a:layout_width="80dp"
 					   a:layout_height="80dp"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonLeft"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft"
 														   a:text=""
 														   calc:textUp="@string/c_up"
 														   calc:textDown="@string/c_down"
@@ -29,7 +29,7 @@
 														   a:layout_height="80dp"
 														   style="@style/digit_button_style"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
 														   a:text=""
 														   calc:textUp="@string/c_up"
 														   calc:textDown="@string/c_down"
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 35ed91cd..2e7241eb 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -26,7 +26,7 @@
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/equalsButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/equalsButton"
 														   a:text="="
 														   a:layout_width="fill_parent"
 														   a:layout_weight="4"
@@ -48,24 +48,24 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 			
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
 														   calc:textDown="asin" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
 														   calc:textDown="acos" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan"
 														   calc:textDown="atan" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×"
 														   calc:textUp="^"
 														   calc:textDown="^2" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/clearButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/clearButton"
 														   a:text="clear"
 														   style="@style/control_button_style"
 														   a:onClick="clearButtonClickHandler"/>
@@ -74,32 +74,32 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 			
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/fourDigitButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fourDigitButton"
 														   a:text="4"
 														   calc:textUp="sinh"
 														   calc:textDown="asinh"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/fiveDigitButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fiveDigitButton"
 														   a:text="5"
 														   calc:textUp="cosh"
 														   calc:textDown="acosh"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6"
 														   calc:textUp="tanh"
 														   calc:textDown="atanh"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
 														   calc:textUp="√"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/eraseButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eraseButton"
 														   a:text="↚"
 														   style="@style/control_button_style"
 														   a:onClick="eraseButtonClickHandler"/>
@@ -108,29 +108,29 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7"
 														   calc:textUp="i"
 														   calc:textDown=""
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8"
 														   calc:textUp="ln"
 														   calc:textDown=""
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9"
 														   calc:textDown="e"
 														   calc:textUp="π"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/plusButton" a:text="+"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/plusButton" a:text="+"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/pasteButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/pasteButton"
 														   a:text="paste"
 														   style="@style/control_button_style"
 														   a:onClick="pasteButtonClickHandler"/>
@@ -140,30 +140,30 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
 														   calc:textUp="("
 														   calc:textDown=")" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
 														   calc:textUp="."
 														   calc:textDown=","
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
 														   calc:textUp="["
 														   calc:textDown="]" style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/subtractionButton" a:text="-"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/subtractionButton" a:text="-"
 														   calc:textUp="{"
 														   calc:textDown="}"
 														   style="@style/digit_button_style"
 														   a:onClick="digitButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/historyButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/historyButton"
 														   a:text=""
 														   calc:textUp="undo"
 														   calc:textDown="redo"
@@ -175,31 +175,31 @@
 		<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
 
 
-			<!--				<org.solovyev.android.view.DirectionDragButton a:id="@+id/numericButton" a:text="numeric"
+			<!--				<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/numericButton" a:text="numeric"
 																									   style="@style/digit_button_style"
 																									   a:onClick="numericButtonClickHandler"/>
 
-														<org.solovyev.android.view.DirectionDragButton a:id="@+id/simplifyButton" a:text="simplify"
+														<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/simplifyButton" a:text="simplify"
 																									   style="@style/digit_button_style"
 																									   a:onClick="simplifyButtonClickHandler"/>-->
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/leftButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/leftButton"
 														   calc:textUp="↞"
 														   a:text="←"
 														   style="@style/control_button_style"
 														   a:onClick="moveLeftButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/rightButton"
+			<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/rightButton"
 														   calc:textUp="↠"
 														   a:text="→"
 														   style="@style/control_button_style"
 														   a:onClick="moveRightButtonClickHandler"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/>
+			<org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/>
+			<org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/>
+			<org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
 
 
 		</LinearLayout>
diff --git a/res/layout-port/number_picker.xml b/res/layout-port/number_picker.xml
index 1b1a31c8..6919a09c 100644
--- a/res/layout-port/number_picker.xml
+++ b/res/layout-port/number_picker.xml
@@ -26,7 +26,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <org.solovyev.android.view.NumberPickerButton android:id="@+id/increment"
+    <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/increment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_up_btn" />
@@ -41,7 +41,7 @@
         android:textSize="30sp"
         android:background="@drawable/timepicker_input" />
 
-    <org.solovyev.android.view.NumberPickerButton android:id="@+id/decrement"
+    <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/decrement"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_down_btn" />
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 07075ce1..8f3ebff2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -3,7 +3,7 @@
 <PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
 	<PreferenceCategory a:title="@string/c_prefs_drag_button_category">
 
-<!--		<org.solovyev.android.view.SeekBarPreference a:key="duration"
+<!--		<org.solovyev.android.view.prefs.SeekBarPreference a:key="duration"
 													 a:title="Duration of something"
 													 a:summary="How long something will last"
 													 a:dialogMessage="Something duration"
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 746027e8..45b71ff6 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -21,6 +21,7 @@ import bsh.EvalError;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.view.*;
+import org.solovyev.android.view.widgets.*;
 import org.solovyev.common.utils.Announcer;
 import org.solovyev.common.utils.history.HistoryAction;
 
diff --git a/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
index 8cebcc7e..f14ce212 100644
--- a/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
@@ -8,6 +8,10 @@ package org.solovyev.android.calculator;
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.view.*;
+import org.solovyev.android.view.widgets.DirectionDragButton;
+import org.solovyev.android.view.widgets.DragButton;
+import org.solovyev.android.view.widgets.DragDirection;
+import org.solovyev.android.view.widgets.SimpleOnDragListener;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java b/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
index 025a2b48..486fced0 100644
--- a/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
@@ -7,10 +7,10 @@ package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.DirectionDragButton;
-import org.solovyev.android.view.DragButton;
-import org.solovyev.android.view.DragDirection;
-import org.solovyev.android.view.SimpleOnDragListener;
+import org.solovyev.android.view.widgets.DirectionDragButton;
+import org.solovyev.android.view.widgets.DragButton;
+import org.solovyev.android.view.widgets.DragDirection;
+import org.solovyev.android.view.widgets.SimpleOnDragListener;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/DragButtonCalibrationActivity.java b/src/main/java/org/solovyev/android/calculator/DragButtonCalibrationActivity.java
index 20824ff8..be578578 100644
--- a/src/main/java/org/solovyev/android/calculator/DragButtonCalibrationActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/DragButtonCalibrationActivity.java
@@ -17,7 +17,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.*;
+import org.solovyev.android.view.widgets.*;
 import org.solovyev.common.collections.ManyValuedHashMap;
 import org.solovyev.common.collections.ManyValuedMap;
 import org.solovyev.common.utils.Interval;
diff --git a/src/main/java/org/solovyev/android/view/prefs/IntervalPreference.java b/src/main/java/org/solovyev/android/view/prefs/IntervalPreference.java
new file mode 100644
index 00000000..d4288880
--- /dev/null
+++ b/src/main/java/org/solovyev/android/view/prefs/IntervalPreference.java
@@ -0,0 +1,48 @@
+package org.solovyev.android.view.prefs;
+
+import android.content.Context;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.view.widgets.NumberPicker;
+
+/**
+ * User: serso
+ * Date: 9/19/11
+ * Time: 12:27 PM
+ */
+public class IntervalPreference extends DialogPreference implements NumberPicker.OnChangedListener {
+
+	@NotNull
+	private final Context context;
+
+	public IntervalPreference(@NotNull Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		this.context = context;
+	}
+
+	public IntervalPreference(@NotNull Context context, AttributeSet attrs) {
+		super(context, attrs);
+		this.context = context;
+	}
+
+	@Override
+	public void onChanged(NumberPicker picker, int oldVal, int newVal) {
+		//To change body of implemented methods use File | Settings | File Templates.
+	}
+
+	@Override
+	protected View onCreateDialogView() {
+		LinearLayout.LayoutParams params;
+		LinearLayout layout = new LinearLayout(context);
+		layout.setOrientation(LinearLayout.VERTICAL);
+		layout.setPadding(6, 6, 6, 6);
+
+		return layout;
+	}
+}
diff --git a/src/main/java/org/solovyev/android/view/SeekBarPreference.java b/src/main/java/org/solovyev/android/view/prefs/SeekBarPreference.java
similarity index 98%
rename from src/main/java/org/solovyev/android/view/SeekBarPreference.java
rename to src/main/java/org/solovyev/android/view/prefs/SeekBarPreference.java
index 01b6cc0a..e66f52cd 100644
--- a/src/main/java/org/solovyev/android/view/SeekBarPreference.java
+++ b/src/main/java/org/solovyev/android/view/prefs/SeekBarPreference.java
@@ -4,7 +4,7 @@
  * or visit http://se.solovyev.org
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.prefs;
 
 import android.preference.DialogPreference;
 import android.content.Context;
diff --git a/src/main/java/org/solovyev/android/view/ColorButton.java b/src/main/java/org/solovyev/android/view/widgets/ColorButton.java
similarity index 97%
rename from src/main/java/org/solovyev/android/view/ColorButton.java
rename to src/main/java/org/solovyev/android/view/widgets/ColorButton.java
index 9b18d655..434f3200 100644
--- a/src/main/java/org/solovyev/android/view/ColorButton.java
+++ b/src/main/java/org/solovyev/android/view/widgets/ColorButton.java
@@ -19,7 +19,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -30,6 +30,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.Button;
 import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.view.FontSizeAdjuster;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/view/DirectionDragButton.java b/src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
similarity index 96%
rename from src/main/java/org/solovyev/android/view/DirectionDragButton.java
rename to src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
index 022aba0b..a5ad49ab 100644
--- a/src/main/java/org/solovyev/android/view/DirectionDragButton.java
+++ b/src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
@@ -3,7 +3,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -13,6 +13,8 @@ import android.text.TextPaint;
 import android.util.AttributeSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.view.widgets.DragButton;
+import org.solovyev.android.view.widgets.DragDirection;
 import org.solovyev.common.utils.Point2d;
 import org.solovyev.common.utils.StringUtils;
 
diff --git a/src/main/java/org/solovyev/android/view/DragButton.java b/src/main/java/org/solovyev/android/view/widgets/DragButton.java
similarity index 98%
rename from src/main/java/org/solovyev/android/view/DragButton.java
rename to src/main/java/org/solovyev/android/view/widgets/DragButton.java
index 58b533f6..289ea360 100644
--- a/src/main/java/org/solovyev/android/view/DragButton.java
+++ b/src/main/java/org/solovyev/android/view/widgets/DragButton.java
@@ -3,7 +3,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/src/main/java/org/solovyev/android/view/DragDirection.java b/src/main/java/org/solovyev/android/view/widgets/DragDirection.java
similarity index 81%
rename from src/main/java/org/solovyev/android/view/DragDirection.java
rename to src/main/java/org/solovyev/android/view/widgets/DragDirection.java
index d7c261b1..6bc6c119 100644
--- a/src/main/java/org/solovyev/android/view/DragDirection.java
+++ b/src/main/java/org/solovyev/android/view/widgets/DragDirection.java
@@ -3,7 +3,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 public enum DragDirection {
 
diff --git a/src/main/java/org/solovyev/android/view/DragEvent.java b/src/main/java/org/solovyev/android/view/widgets/DragEvent.java
similarity index 94%
rename from src/main/java/org/solovyev/android/view/DragEvent.java
rename to src/main/java/org/solovyev/android/view/widgets/DragEvent.java
index e1f6ddf2..94cf00ba 100644
--- a/src/main/java/org/solovyev/android/view/DragEvent.java
+++ b/src/main/java/org/solovyev/android/view/widgets/DragEvent.java
@@ -3,7 +3,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/solovyev/android/view/DragPreferencesChangeListener.java b/src/main/java/org/solovyev/android/view/widgets/DragPreferencesChangeListener.java
similarity index 92%
rename from src/main/java/org/solovyev/android/view/DragPreferencesChangeListener.java
rename to src/main/java/org/solovyev/android/view/widgets/DragPreferencesChangeListener.java
index 69266330..1da5646f 100644
--- a/src/main/java/org/solovyev/android/view/DragPreferencesChangeListener.java
+++ b/src/main/java/org/solovyev/android/view/widgets/DragPreferencesChangeListener.java
@@ -3,7 +3,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.DragButtonCalibrationActivity;
diff --git a/src/main/java/org/solovyev/android/view/HistoryDragProcessor.java b/src/main/java/org/solovyev/android/view/widgets/HistoryDragProcessor.java
similarity index 94%
rename from src/main/java/org/solovyev/android/view/HistoryDragProcessor.java
rename to src/main/java/org/solovyev/android/view/widgets/HistoryDragProcessor.java
index 4287be94..5cc26ce1 100644
--- a/src/main/java/org/solovyev/android/view/HistoryDragProcessor.java
+++ b/src/main/java/org/solovyev/android/view/widgets/HistoryDragProcessor.java
@@ -3,12 +3,12 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import android.util.Log;
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.*;
+import org.solovyev.android.view.HistoryControl;
 import org.solovyev.common.utils.Point2d;
 import org.solovyev.common.utils.StringUtils;
 import org.solovyev.common.utils.history.HistoryAction;
diff --git a/src/main/java/org/solovyev/android/view/NumberPicker.java b/src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
similarity index 99%
rename from src/main/java/org/solovyev/android/view/NumberPicker.java
rename to src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
index 071b14a6..83646db2 100644
--- a/src/main/java/org/solovyev/android/view/NumberPicker.java
+++ b/src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
@@ -4,7 +4,7 @@
  * or visit http://se.solovyev.org
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/view/NumberPickerButton.java b/src/main/java/org/solovyev/android/view/widgets/NumberPickerButton.java
similarity index 98%
rename from src/main/java/org/solovyev/android/view/NumberPickerButton.java
rename to src/main/java/org/solovyev/android/view/widgets/NumberPickerButton.java
index 7207a01b..b9213abe 100644
--- a/src/main/java/org/solovyev/android/view/NumberPickerButton.java
+++ b/src/main/java/org/solovyev/android/view/widgets/NumberPickerButton.java
@@ -4,7 +4,7 @@
  * or visit http://se.solovyev.org
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/view/OnDragListener.java b/src/main/java/org/solovyev/android/view/widgets/OnDragListener.java
similarity index 82%
rename from src/main/java/org/solovyev/android/view/OnDragListener.java
rename to src/main/java/org/solovyev/android/view/widgets/OnDragListener.java
index b1b6e440..574a8965 100644
--- a/src/main/java/org/solovyev/android/view/OnDragListener.java
+++ b/src/main/java/org/solovyev/android/view/widgets/OnDragListener.java
@@ -3,9 +3,11 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.view.widgets.DragButton;
+import org.solovyev.android.view.widgets.DragEvent;
 
 import java.util.EventListener;
 
diff --git a/src/main/java/org/solovyev/android/view/SimpleOnDragListener.java b/src/main/java/org/solovyev/android/view/widgets/SimpleOnDragListener.java
similarity index 99%
rename from src/main/java/org/solovyev/android/view/SimpleOnDragListener.java
rename to src/main/java/org/solovyev/android/view/widgets/SimpleOnDragListener.java
index 2f8ebf3b..4f12f3a8 100644
--- a/src/main/java/org/solovyev/android/view/SimpleOnDragListener.java
+++ b/src/main/java/org/solovyev/android/view/widgets/SimpleOnDragListener.java
@@ -3,7 +3,7 @@
  * For more information, please, contact se.solovyev@gmail.com
  */
 
-package org.solovyev.android.view;
+package org.solovyev.android.view.widgets;
 
 import android.util.Log;
 import android.view.MotionEvent;