Project restructure

We don't need to separate widget/onscreen from the main module, let's merge them together.

android-app/src/main/res/layout/widget_layout_lockscreen.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical"
+	style="@style/cpp_widget_main_layout_style">
+
+	<include
+		layout="@layout/widget_editor"
+		a:layout_weight="2"
+		a:layout_width="match_parent"
+		a:layout_height="0dp" />
+
+	<LinearLayout
+		a:layout_weight="1"
+		a:layout_width="match_parent"
+		a:layout_height="0dp">
+
+		<include
+			layout="@layout/cpp_simple_button_equals"
+			a:layout_margin="@dimen/cpp_button_margin"
+			a:layout_weight="1"
+			a:layout_width="0dp"
+			a:layout_height="match_parent" />
+
+		<include
+			layout="@layout/widget_display"
+			a:layout_weight="5"
+			a:layout_width="0dp"
+			a:layout_height="match_parent" />
+
+	</LinearLayout>
+
+	<include
+		layout="@layout/cpp_simple_keyboard_lockscreen"
+		a:layout_weight="4"
+		a:layout_width="match_parent"
+		a:layout_height="0dp" />
+
+</LinearLayout>