diff --git a/apps/Makefile b/apps/Makefile
index 294b8afec..53c2fcaa4 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -4,42 +4,26 @@ include apps/home/Makefile
 include apps/probability/Makefile
 include apps/regression/Makefile
 include apps/settings/Makefile
+include apps/shared/Makefile
 include apps/statistics/Makefile
 #include apps/picview/Makefile
 
 app_objs += $(addprefix apps/,\
   apps_container.o\
   apps_window.o\
-  banner_view.o\
   battery_view.o\
   constant.o\
-  cursor_view.o\
-  curve_view.o\
-  curve_view_cursor.o\
-  curve_view_range.o\
-  editable_cell_table_view_controller.o\
-  expression_text_field_delegate.o\
-  float_pair_store.o\
-  float_parameter_controller.o\
-  interactive_curve_view_controller.o\
-  interactive_curve_view_range.o\
   main.o\
-  memoized_curve_view_range.o\
   node.o\
   node_list_view_controller.o\
   node_navigation_controller.o\
   preferences.o\
-  range_parameter_controller.o\
-  store_controller.o\
-  store_parameter_controller.o\
-  text_field_delegate_app.o\
   title_bar_view.o\
   toolbox_controller.o\
   toolbox_leaf_cell.o\
   toolbox_node.o\
   variable_box_controller.o\
   variable_box_leaf_cell.o\
-  zoom_parameter_controller.o\
 )
 
 # Tracking which source file uses which image is painful. But we need to ensure
diff --git a/apps/calculation/app.h b/apps/calculation/app.h
index 3f93f11f8..184eddc15 100644
--- a/apps/calculation/app.h
+++ b/apps/calculation/app.h
@@ -4,7 +4,7 @@
 #include "edit_expression_controller.h"
 #include "local_context.h"
 #include "history_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 #include <escher.h>
 
 namespace Calculation {
diff --git a/apps/graph/app.h b/apps/graph/app.h
index 82bb18427..99d33113e 100644
--- a/apps/graph/app.h
+++ b/apps/graph/app.h
@@ -7,7 +7,7 @@
 #include "graph/graph_controller.h"
 #include "list/list_controller.h"
 #include "values/values_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 
 namespace Graph {
 
diff --git a/apps/graph/graph/banner_view.h b/apps/graph/graph/banner_view.h
index a861a8d3a..fbd313560 100644
--- a/apps/graph/graph/banner_view.h
+++ b/apps/graph/graph/banner_view.h
@@ -2,7 +2,7 @@
 #define GRAPH_BANNER_VIEW_H
 
 #include <escher.h>
-#include "../../banner_view.h"
+#include "../../shared/banner_view.h"
 
 namespace Graph {
 
diff --git a/apps/graph/graph/curve_parameter_controller.h b/apps/graph/graph/curve_parameter_controller.h
index 0fad7a742..e86ce9728 100644
--- a/apps/graph/graph/curve_parameter_controller.h
+++ b/apps/graph/graph/curve_parameter_controller.h
@@ -5,8 +5,8 @@
 #include "goto_parameter_controller.h"
 #include "banner_view.h"
 #include "../function.h"
-#include "../../curve_view_cursor.h"
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/curve_view_cursor.h"
+#include "../../shared/interactive_curve_view_range.h"
 
 namespace Graph {
 
diff --git a/apps/graph/graph/goto_parameter_controller.h b/apps/graph/graph/goto_parameter_controller.h
index 546155282..995750791 100644
--- a/apps/graph/graph/goto_parameter_controller.h
+++ b/apps/graph/graph/goto_parameter_controller.h
@@ -3,9 +3,9 @@
 
 #include <escher.h>
 #include "graph_view.h"
-#include "../../float_parameter_controller.h"
-#include "../../curve_view_cursor.h"
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/float_parameter_controller.h"
+#include "../../shared/curve_view_cursor.h"
+#include "../../shared/interactive_curve_view_range.h"
 
 namespace Graph {
 class GoToParameterController : public FloatParameterController {
diff --git a/apps/graph/graph/graph_controller.h b/apps/graph/graph/graph_controller.h
index df76b7d21..5331a1699 100644
--- a/apps/graph/graph/graph_controller.h
+++ b/apps/graph/graph/graph_controller.h
@@ -6,7 +6,7 @@
 #include "banner_view.h"
 #include "curve_parameter_controller.h"
 #include "initialisation_parameter_controller.h"
-#include "../../interactive_curve_view_controller.h"
+#include "../../shared/interactive_curve_view_controller.h"
 #include "../function_store.h"
 
 namespace Graph {
diff --git a/apps/graph/graph/graph_view.h b/apps/graph/graph/graph_view.h
index 2b0d0158f..ec600e515 100644
--- a/apps/graph/graph/graph_view.h
+++ b/apps/graph/graph/graph_view.h
@@ -2,10 +2,10 @@
 #define GRAPH_GRAPH_VIEW_H
 
 #include <escher.h>
-#include "../../curve_view.h"
+#include "../../shared/curve_view.h"
 #include "../../constant.h"
 #include "../function_store.h"
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/interactive_curve_view_range.h"
 #include "../../preferences.h"
 
 namespace Graph {
diff --git a/apps/graph/graph/initialisation_parameter_controller.h b/apps/graph/graph/initialisation_parameter_controller.h
index 5b0b2bfbc..14d9e10de 100644
--- a/apps/graph/graph/initialisation_parameter_controller.h
+++ b/apps/graph/graph/initialisation_parameter_controller.h
@@ -2,7 +2,7 @@
 #define GRAPH_GRAPH_INITIALISATION_PARAMETER_CONTROLLER_H
 
 #include <escher.h>
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/interactive_curve_view_range.h"
 
 namespace Graph {
 
diff --git a/apps/graph/values/interval_parameter_controller.h b/apps/graph/values/interval_parameter_controller.h
index 143053a22..75a4e3cbf 100644
--- a/apps/graph/values/interval_parameter_controller.h
+++ b/apps/graph/values/interval_parameter_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher.h>
 #include "interval.h"
-#include "../../float_parameter_controller.h"
+#include "../../shared/float_parameter_controller.h"
 
 namespace Graph {
 
diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h
index 281d11ae2..3c2106ca3 100644
--- a/apps/graph/values/values_controller.h
+++ b/apps/graph/values/values_controller.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "../function_store.h"
 #include "../function_title_cell.h"
-#include "../../editable_cell_table_view_controller.h"
+#include "../../shared/editable_cell_table_view_controller.h"
 #include "interval.h"
 #include "abscissa_parameter_controller.h"
 #include "derivative_parameter_controller.h"
diff --git a/apps/probability/app.h b/apps/probability/app.h
index 0b6f973fd..4ce0433b9 100644
--- a/apps/probability/app.h
+++ b/apps/probability/app.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include <poincare.h>
 #include "law_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 
 namespace Probability {
 
diff --git a/apps/probability/law/law.h b/apps/probability/law/law.h
index b1efbd4e1..41d85b015 100644
--- a/apps/probability/law/law.h
+++ b/apps/probability/law/law.h
@@ -2,7 +2,7 @@
 #define PROBABILITE_LAW_H
 
 #include <poincare.h>
-#include "../../curve_view_range.h"
+#include "../../shared/curve_view_range.h"
 
 namespace Probability {
 
diff --git a/apps/probability/law_curve_view.h b/apps/probability/law_curve_view.h
index c26862f34..f0f0261ee 100644
--- a/apps/probability/law_curve_view.h
+++ b/apps/probability/law_curve_view.h
@@ -1,7 +1,7 @@
 #ifndef PROBABILITY_LAW_CURVE_VIEW_H
 #define PROBABILITY_LAW_CURVE_VIEW_H
 
-#include "../curve_view.h"
+#include "../shared/curve_view.h"
 #include "../constant.h"
 #include "law/law.h"
 #include "calculation/calculation.h"
diff --git a/apps/probability/parameters_controller.h b/apps/probability/parameters_controller.h
index 8bbde1136..6ef135d44 100644
--- a/apps/probability/parameters_controller.h
+++ b/apps/probability/parameters_controller.h
@@ -2,7 +2,7 @@
 #define PROBABILITY_PARAMETERS_CONTROLLER_H
 
 #include <escher.h>
-#include "../float_parameter_controller.h"
+#include "../shared/float_parameter_controller.h"
 #include "law/law.h"
 #include "calculation_controller.h"
 
diff --git a/apps/regression/app.h b/apps/regression/app.h
index b2de84ad4..c72bb4660 100644
--- a/apps/regression/app.h
+++ b/apps/regression/app.h
@@ -2,7 +2,7 @@
 #define REGRESSION_APP_H
 
 #include <escher.h>
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 #include "store.h"
 #include "store_controller.h"
 #include "graph_controller.h"
diff --git a/apps/regression/banner_view.h b/apps/regression/banner_view.h
index eb3e33739..5030f0ede 100644
--- a/apps/regression/banner_view.h
+++ b/apps/regression/banner_view.h
@@ -2,7 +2,7 @@
 #define REGRESSION_BANNER_VIEW_H
 
 #include <escher.h>
-#include "../banner_view.h"
+#include "../shared/banner_view.h"
 
 namespace Regression {
 
diff --git a/apps/regression/go_to_parameter_controller.h b/apps/regression/go_to_parameter_controller.h
index fbb3f7cb5..fd44358a6 100644
--- a/apps/regression/go_to_parameter_controller.h
+++ b/apps/regression/go_to_parameter_controller.h
@@ -2,8 +2,8 @@
 #define REGRESSION_GO_TO_PARAMETER_CONTROLLER_H
 
 #include <escher.h>
-#include "../float_parameter_controller.h"
-#include "../curve_view_cursor.h"
+#include "../shared/float_parameter_controller.h"
+#include "../shared/curve_view_cursor.h"
 #include "store.h"
 
 namespace Regression {
diff --git a/apps/regression/graph_controller.h b/apps/regression/graph_controller.h
index ae4ebed6c..fc82fed9d 100644
--- a/apps/regression/graph_controller.h
+++ b/apps/regression/graph_controller.h
@@ -7,7 +7,7 @@
 #include "graph_view.h"
 #include "initialisation_parameter_controller.h"
 #include "prediction_parameter_controller.h"
-#include "../interactive_curve_view_controller.h"
+#include "../shared/interactive_curve_view_controller.h"
 
 namespace Regression {
 
diff --git a/apps/regression/graph_view.h b/apps/regression/graph_view.h
index d62569ec2..d0bb08a43 100644
--- a/apps/regression/graph_view.h
+++ b/apps/regression/graph_view.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "store.h"
 #include "../constant.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"
 
 namespace Regression {
 
diff --git a/apps/regression/prediction_parameter_controller.h b/apps/regression/prediction_parameter_controller.h
index 2565330a4..0914cf968 100644
--- a/apps/regression/prediction_parameter_controller.h
+++ b/apps/regression/prediction_parameter_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher.h>
 #include "store.h"
-#include "../curve_view_cursor.h"
+#include "../shared/curve_view_cursor.h"
 #include "go_to_parameter_controller.h"
 
 namespace Regression {
diff --git a/apps/regression/store.h b/apps/regression/store.h
index b1f6e8a9b..d193653e4 100644
--- a/apps/regression/store.h
+++ b/apps/regression/store.h
@@ -1,8 +1,8 @@
 #ifndef REGRESSION_STORE_H
 #define REGRESSION_STORE_H
 
-#include "../interactive_curve_view_range.h"
-#include "../float_pair_store.h"
+#include "../shared/interactive_curve_view_range.h"
+#include "../shared/float_pair_store.h"
 
 namespace Regression {
 
diff --git a/apps/regression/store_controller.h b/apps/regression/store_controller.h
index 7171334a0..49adac613 100644
--- a/apps/regression/store_controller.h
+++ b/apps/regression/store_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher.h>
 #include "store.h"
-#include "../store_controller.h"
+#include "../shared/store_controller.h"
 
 namespace Regression {
 
diff --git a/apps/shared/Makefile b/apps/shared/Makefile
new file mode 100644
index 000000000..3238c683f
--- /dev/null
+++ b/apps/shared/Makefile
@@ -0,0 +1,19 @@
+app_objs += $(addprefix apps/shared/,\
+  banner_view.o\
+  cursor_view.o\
+  curve_view.o\
+  curve_view_cursor.o\
+  curve_view_range.o\
+  editable_cell_table_view_controller.o\
+  expression_text_field_delegate.o\
+  float_pair_store.o\
+  float_parameter_controller.o\
+  interactive_curve_view_controller.o\
+  interactive_curve_view_range.o\
+  memoized_curve_view_range.o\
+  range_parameter_controller.o\
+  store_controller.o\
+  store_parameter_controller.o\
+  text_field_delegate_app.o\
+  zoom_parameter_controller.o\
+)
diff --git a/apps/banner_view.cpp b/apps/shared/banner_view.cpp
similarity index 100%
rename from apps/banner_view.cpp
rename to apps/shared/banner_view.cpp
diff --git a/apps/banner_view.h b/apps/shared/banner_view.h
similarity index 86%
rename from apps/banner_view.h
rename to apps/shared/banner_view.h
index 0de2285af..8b7491454 100644
--- a/apps/banner_view.h
+++ b/apps/shared/banner_view.h
@@ -1,5 +1,5 @@
-#ifndef APPS_BANNER_VIEW_H
-#define APPS_BANNER_VIEW_H
+#ifndef SHARED_BANNER_VIEW_H
+#define SHARED_BANNER_VIEW_H
 
 #include <escher.h>
 
diff --git a/apps/cursor_view.cpp b/apps/shared/cursor_view.cpp
similarity index 100%
rename from apps/cursor_view.cpp
rename to apps/shared/cursor_view.cpp
diff --git a/apps/cursor_view.h b/apps/shared/cursor_view.h
similarity index 72%
rename from apps/cursor_view.h
rename to apps/shared/cursor_view.h
index d0c706a1d..c7d3b306a 100644
--- a/apps/cursor_view.h
+++ b/apps/shared/cursor_view.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURSOR_VIEW_H
-#define APPS_CURSOR_VIEW_H
+#ifndef SHARED_CURSOR_VIEW_H
+#define SHARED_CURSOR_VIEW_H
 
 #include <escher.h>
 
diff --git a/apps/curve_view.cpp b/apps/shared/curve_view.cpp
similarity index 99%
rename from apps/curve_view.cpp
rename to apps/shared/curve_view.cpp
index 4cca19ac8..f29a0e357 100644
--- a/apps/curve_view.cpp
+++ b/apps/shared/curve_view.cpp
@@ -1,5 +1,5 @@
 #include "curve_view.h"
-#include "constant.h"
+#include "../constant.h"
 #include <assert.h>
 #include <math.h>
 #include <float.h>
diff --git a/apps/curve_view.h b/apps/shared/curve_view.h
similarity index 98%
rename from apps/curve_view.h
rename to apps/shared/curve_view.h
index 680c93482..1b4eff0a8 100644
--- a/apps/curve_view.h
+++ b/apps/shared/curve_view.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURVE_VIEW_H
-#define APPS_CURVE_VIEW_H
+#ifndef SHARED_CURVE_VIEW_H
+#define SHARED_CURVE_VIEW_H
 
 #include <escher.h>
 #include <poincare.h>
diff --git a/apps/curve_view_cursor.cpp b/apps/shared/curve_view_cursor.cpp
similarity index 100%
rename from apps/curve_view_cursor.cpp
rename to apps/shared/curve_view_cursor.cpp
diff --git a/apps/curve_view_cursor.h b/apps/shared/curve_view_cursor.h
similarity index 69%
rename from apps/curve_view_cursor.h
rename to apps/shared/curve_view_cursor.h
index fc384a55c..b8386a23f 100644
--- a/apps/curve_view_cursor.h
+++ b/apps/shared/curve_view_cursor.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURVE_VIEW_CURSOR_H
-#define APPS_CURVE_VIEW_CURSOR_H
+#ifndef SHARED_CURVE_VIEW_CURSOR_H
+#define SHARED_CURVE_VIEW_CURSOR_H
 
 
 class CurveViewCursor {
diff --git a/apps/curve_view_range.cpp b/apps/shared/curve_view_range.cpp
similarity index 100%
rename from apps/curve_view_range.cpp
rename to apps/shared/curve_view_range.cpp
diff --git a/apps/curve_view_range.h b/apps/shared/curve_view_range.h
similarity index 93%
rename from apps/curve_view_range.h
rename to apps/shared/curve_view_range.h
index 83a330491..e807c3310 100644
--- a/apps/curve_view_range.h
+++ b/apps/shared/curve_view_range.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURVE_VIEW_RANGE_H
-#define APPS_CURVE_VIEW_RANGE_H
+#ifndef SHARED_CURVE_VIEW_RANGE_H
+#define SHARED_CURVE_VIEW_RANGE_H
 
 #include <stdint.h>
 
diff --git a/apps/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp
similarity index 98%
rename from apps/editable_cell_table_view_controller.cpp
rename to apps/shared/editable_cell_table_view_controller.cpp
index 37c22d4eb..fa97042b6 100644
--- a/apps/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -1,6 +1,6 @@
 #include "editable_cell_table_view_controller.h"
-#include "apps_container.h"
-#include "constant.h"
+#include "../apps_container.h"
+#include "../constant.h"
 #include "text_field_delegate_app.h"
 #include <assert.h>
 
diff --git a/apps/editable_cell_table_view_controller.h b/apps/shared/editable_cell_table_view_controller.h
similarity index 93%
rename from apps/editable_cell_table_view_controller.h
rename to apps/shared/editable_cell_table_view_controller.h
index 5ff75009c..860ac32e2 100644
--- a/apps/editable_cell_table_view_controller.h
+++ b/apps/shared/editable_cell_table_view_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
-#define APPS_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
+#ifndef SHARED_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
+#define SHARED_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
 
 #include <escher.h>
 #include <poincare.h>
diff --git a/apps/expression_text_field_delegate.cpp b/apps/shared/expression_text_field_delegate.cpp
similarity index 98%
rename from apps/expression_text_field_delegate.cpp
rename to apps/shared/expression_text_field_delegate.cpp
index cee3997c6..ebe28d6bb 100644
--- a/apps/expression_text_field_delegate.cpp
+++ b/apps/shared/expression_text_field_delegate.cpp
@@ -1,5 +1,5 @@
 #include "expression_text_field_delegate.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 #include <math.h>
 #include <string.h>
 
diff --git a/apps/expression_text_field_delegate.h b/apps/shared/expression_text_field_delegate.h
similarity index 79%
rename from apps/expression_text_field_delegate.h
rename to apps/shared/expression_text_field_delegate.h
index 44064d1ac..653900a06 100644
--- a/apps/expression_text_field_delegate.h
+++ b/apps/shared/expression_text_field_delegate.h
@@ -1,5 +1,5 @@
-#ifndef APPS_EXPRESSION_TEXT_FIELD_DELEGATE_H
-#define APPS_EXPRESSION_TEXT_FIELD_DELEGATE_H
+#ifndef SHARED_EXPRESSION_TEXT_FIELD_DELEGATE_H
+#define SHARED_EXPRESSION_TEXT_FIELD_DELEGATE_H
 
 #include <escher.h>
 #include <poincare.h>
diff --git a/apps/float_pair_store.cpp b/apps/shared/float_pair_store.cpp
similarity index 100%
rename from apps/float_pair_store.cpp
rename to apps/shared/float_pair_store.cpp
diff --git a/apps/float_pair_store.h b/apps/shared/float_pair_store.h
similarity index 89%
rename from apps/float_pair_store.h
rename to apps/shared/float_pair_store.h
index 12394a250..0e32e77ee 100644
--- a/apps/float_pair_store.h
+++ b/apps/shared/float_pair_store.h
@@ -1,5 +1,5 @@
-#ifndef APPS_FLOAT_PAIR_STORE_H
-#define APPS_FLOAT_PAIR_STORE_H
+#ifndef SHARED_FLOAT_PAIR_STORE_H
+#define SHARED_FLOAT_PAIR_STORE_H
 
 #include <stdint.h>
 
diff --git a/apps/float_parameter_controller.cpp b/apps/shared/float_parameter_controller.cpp
similarity index 97%
rename from apps/float_parameter_controller.cpp
rename to apps/shared/float_parameter_controller.cpp
index a43767f61..05d41a989 100644
--- a/apps/float_parameter_controller.cpp
+++ b/apps/shared/float_parameter_controller.cpp
@@ -1,6 +1,6 @@
 #include "float_parameter_controller.h"
-#include "constant.h"
-#include "apps_container.h"
+#include "../constant.h"
+#include "../apps_container.h"
 #include "text_field_delegate_app.h"
 #include <assert.h>
 
diff --git a/apps/float_parameter_controller.h b/apps/shared/float_parameter_controller.h
similarity index 92%
rename from apps/float_parameter_controller.h
rename to apps/shared/float_parameter_controller.h
index e159a55a1..cf871afcc 100644
--- a/apps/float_parameter_controller.h
+++ b/apps/shared/float_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_FLOAT_PARAMETER_CONTROLLER_H
-#define APPS_FLOAT_PARAMETER_CONTROLLER_H
+#ifndef SHARED_FLOAT_PARAMETER_CONTROLLER_H
+#define SHARED_FLOAT_PARAMETER_CONTROLLER_H
 
 #include <escher.h>
 #include "expression_text_field_delegate.h"
diff --git a/apps/interactive_curve_view_controller.cpp b/apps/shared/interactive_curve_view_controller.cpp
similarity index 99%
rename from apps/interactive_curve_view_controller.cpp
rename to apps/shared/interactive_curve_view_controller.cpp
index 574165b1d..f4b45cade 100644
--- a/apps/interactive_curve_view_controller.cpp
+++ b/apps/shared/interactive_curve_view_controller.cpp
@@ -1,5 +1,5 @@
 #include "interactive_curve_view_controller.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 #include <assert.h>
 #include <math.h>
 
diff --git a/apps/interactive_curve_view_controller.h b/apps/shared/interactive_curve_view_controller.h
similarity index 95%
rename from apps/interactive_curve_view_controller.h
rename to apps/shared/interactive_curve_view_controller.h
index bf7a5b151..bbdc23631 100644
--- a/apps/interactive_curve_view_controller.h
+++ b/apps/shared/interactive_curve_view_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
-#define APPS_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
+#ifndef SHARED_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
+#define SHARED_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
 
 #include <escher.h>
 #include "interactive_curve_view_range.h"
diff --git a/apps/interactive_curve_view_range.cpp b/apps/shared/interactive_curve_view_range.cpp
similarity index 100%
rename from apps/interactive_curve_view_range.cpp
rename to apps/shared/interactive_curve_view_range.cpp
diff --git a/apps/interactive_curve_view_range.h b/apps/shared/interactive_curve_view_range.h
similarity index 93%
rename from apps/interactive_curve_view_range.h
rename to apps/shared/interactive_curve_view_range.h
index 5d3df892e..e7002124a 100644
--- a/apps/interactive_curve_view_range.h
+++ b/apps/shared/interactive_curve_view_range.h
@@ -1,5 +1,5 @@
-#ifndef APPS_INTERACTIVE_CURVE_VIEW_RANGE_H
-#define APPS_INTERACTIVE_CURVE_VIEW_RANGE_H
+#ifndef SHARED_INTERACTIVE_CURVE_VIEW_RANGE_H
+#define SHARED_INTERACTIVE_CURVE_VIEW_RANGE_H
 
 #include <stdint.h>
 #include <poincare.h>
diff --git a/apps/interactive_curve_view_range_delegate.h b/apps/shared/interactive_curve_view_range_delegate.h
similarity index 65%
rename from apps/interactive_curve_view_range_delegate.h
rename to apps/shared/interactive_curve_view_range_delegate.h
index 87645359b..8984838ff 100644
--- a/apps/interactive_curve_view_range_delegate.h
+++ b/apps/shared/interactive_curve_view_range_delegate.h
@@ -1,5 +1,5 @@
-#ifndef APPS_INTERACTIVE_CURVE_VIEW_DELEGATE_H
-#define APPS_INTERACTIVE_CURVE_VIEW_DELEGATE_H
+#ifndef SHARED_INTERACTIVE_CURVE_VIEW_DELEGATE_H
+#define SHARED_INTERACTIVE_CURVE_VIEW_DELEGATE_H
 
 class InteractiveCurveViewRange;
 
diff --git a/apps/memoized_curve_view_range.cpp b/apps/shared/memoized_curve_view_range.cpp
similarity index 100%
rename from apps/memoized_curve_view_range.cpp
rename to apps/shared/memoized_curve_view_range.cpp
diff --git a/apps/memoized_curve_view_range.h b/apps/shared/memoized_curve_view_range.h
similarity index 87%
rename from apps/memoized_curve_view_range.h
rename to apps/shared/memoized_curve_view_range.h
index fff68b2fd..ba9edf36b 100644
--- a/apps/memoized_curve_view_range.h
+++ b/apps/shared/memoized_curve_view_range.h
@@ -1,5 +1,5 @@
-#ifndef APPS_MEMOIZED_CURVE_VIEW_RANGE_H
-#define APPS_MEMOIZED_CURVE_VIEW_RANGE_H
+#ifndef SHARED_MEMOIZED_CURVE_VIEW_RANGE_H
+#define SHARED_MEMOIZED_CURVE_VIEW_RANGE_H
 
 #include "curve_view_range.h"
 
diff --git a/apps/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp
similarity index 99%
rename from apps/range_parameter_controller.cpp
rename to apps/shared/range_parameter_controller.cpp
index 31e54a137..4aa20236a 100644
--- a/apps/range_parameter_controller.cpp
+++ b/apps/shared/range_parameter_controller.cpp
@@ -1,5 +1,5 @@
 #include "range_parameter_controller.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 #include <assert.h>
 
 using namespace Poincare;
diff --git a/apps/range_parameter_controller.h b/apps/shared/range_parameter_controller.h
similarity index 93%
rename from apps/range_parameter_controller.h
rename to apps/shared/range_parameter_controller.h
index 1d395a033..c3e9ee761 100644
--- a/apps/range_parameter_controller.h
+++ b/apps/shared/range_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_RANGE_PARAMETER_CONTROLLER_H
-#define APPS_RANGE_PARAMETER_CONTROLLER_H
+#ifndef SHARED_RANGE_PARAMETER_CONTROLLER_H
+#define SHARED_RANGE_PARAMETER_CONTROLLER_H
 
 #include <escher.h>
 #include "interactive_curve_view_range.h"
diff --git a/apps/store_controller.cpp b/apps/shared/store_controller.cpp
similarity index 98%
rename from apps/store_controller.cpp
rename to apps/shared/store_controller.cpp
index 2745c1f32..b4648757a 100644
--- a/apps/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -1,6 +1,6 @@
 #include "store_controller.h"
-#include "apps_container.h"
-#include "constant.h"
+#include "../apps_container.h"
+#include "../constant.h"
 #include <assert.h>
 
 using namespace Poincare;
diff --git a/apps/store_controller.h b/apps/shared/store_controller.h
similarity index 96%
rename from apps/store_controller.h
rename to apps/shared/store_controller.h
index 80c99f6d5..a0d57b77e 100644
--- a/apps/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_STORE_CONTROLLER_H
-#define APPS_STORE_CONTROLLER_H
+#ifndef SHARED_STORE_CONTROLLER_H
+#define SHARED_STORE_CONTROLLER_H
 
 #include <escher.h>
 #include "float_pair_store.h"
diff --git a/apps/store_parameter_controller.cpp b/apps/shared/store_parameter_controller.cpp
similarity index 100%
rename from apps/store_parameter_controller.cpp
rename to apps/shared/store_parameter_controller.cpp
diff --git a/apps/store_parameter_controller.h b/apps/shared/store_parameter_controller.h
similarity index 91%
rename from apps/store_parameter_controller.h
rename to apps/shared/store_parameter_controller.h
index 2aec6d0b5..c0a42618b 100644
--- a/apps/store_parameter_controller.h
+++ b/apps/shared/store_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_STORE_PARAM_CONTROLLER_H
-#define APPS_STORE_PARAM_CONTROLLER_H
+#ifndef SHARED_STORE_PARAM_CONTROLLER_H
+#define SHARED_STORE_PARAM_CONTROLLER_H
 
 #include <escher.h>
 #include "float_pair_store.h"
diff --git a/apps/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp
similarity index 94%
rename from apps/text_field_delegate_app.cpp
rename to apps/shared/text_field_delegate_app.cpp
index e7e336558..122bc6b3a 100644
--- a/apps/text_field_delegate_app.cpp
+++ b/apps/shared/text_field_delegate_app.cpp
@@ -1,5 +1,5 @@
 #include "text_field_delegate_app.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 
 using namespace Poincare;
 
diff --git a/apps/text_field_delegate_app.h b/apps/shared/text_field_delegate_app.h
similarity index 82%
rename from apps/text_field_delegate_app.h
rename to apps/shared/text_field_delegate_app.h
index 9b3788fc9..b8f359f3d 100644
--- a/apps/text_field_delegate_app.h
+++ b/apps/shared/text_field_delegate_app.h
@@ -1,5 +1,5 @@
-#ifndef APPS_TEXT_FIELD_DELEGATE_APP_H
-#define APPS_TEXT_FIELD_DELEGATE_APP_H
+#ifndef SHARED_TEXT_FIELD_DELEGATE_APP_H
+#define SHARED_TEXT_FIELD_DELEGATE_APP_H
 
 #include <escher.h>
 #include "expression_text_field_delegate.h"
diff --git a/apps/zoom_parameter_controller.cpp b/apps/shared/zoom_parameter_controller.cpp
similarity index 100%
rename from apps/zoom_parameter_controller.cpp
rename to apps/shared/zoom_parameter_controller.cpp
diff --git a/apps/zoom_parameter_controller.h b/apps/shared/zoom_parameter_controller.h
similarity index 94%
rename from apps/zoom_parameter_controller.h
rename to apps/shared/zoom_parameter_controller.h
index 551e42258..8ccb4a081 100644
--- a/apps/zoom_parameter_controller.h
+++ b/apps/shared/zoom_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_ZOOM_PARAMETER_CONTROLLER_H
-#define APPS_ZOOM_PARAMETER_CONTROLLER_H
+#ifndef SHARED_ZOOM_PARAMETER_CONTROLLER_H
+#define SHARED_ZOOM_PARAMETER_CONTROLLER_H
 
 #include <escher.h>
 #include "interactive_curve_view_range.h"
diff --git a/apps/statistics/app.h b/apps/statistics/app.h
index 7d89f3a97..d04537d78 100644
--- a/apps/statistics/app.h
+++ b/apps/statistics/app.h
@@ -7,7 +7,7 @@
 #include "store.h"
 #include "store_controller.h"
 #include "histogram_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/box_banner_view.h b/apps/statistics/box_banner_view.h
index c47b9c6b9..e8883e42e 100644
--- a/apps/statistics/box_banner_view.h
+++ b/apps/statistics/box_banner_view.h
@@ -2,7 +2,7 @@
 #define STATISTICS_BOX_BANNER_VIEW_H
 
 #include <escher.h>
-#include "../banner_view.h"
+#include "../shared/banner_view.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/box_range.h b/apps/statistics/box_range.h
index f7bf11664..b4f48ac4a 100644
--- a/apps/statistics/box_range.h
+++ b/apps/statistics/box_range.h
@@ -1,7 +1,7 @@
 #ifndef STATISTICS_BOX_RANGE_H
 #define STATISTICS_BOX_RANGE_H
 
-#include "../curve_view_range.h"
+#include "../shared/curve_view_range.h"
 #include "store.h"
 
 namespace Statistics {
diff --git a/apps/statistics/box_view.h b/apps/statistics/box_view.h
index 437171808..842219952 100644
--- a/apps/statistics/box_view.h
+++ b/apps/statistics/box_view.h
@@ -5,7 +5,7 @@
 #include "store.h"
 #include "box_range.h"
 #include "../constant.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/histogram_banner_view.h b/apps/statistics/histogram_banner_view.h
index 5dc3306c4..6ac957bee 100644
--- a/apps/statistics/histogram_banner_view.h
+++ b/apps/statistics/histogram_banner_view.h
@@ -2,7 +2,7 @@
 #define STATISTICS_HISTOGRAM_BANNER_VIEW_H
 
 #include <escher.h>
-#include "../banner_view.h"
+#include "../shared/banner_view.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/histogram_controller.h b/apps/statistics/histogram_controller.h
index bcd657432..4fec4feb4 100644
--- a/apps/statistics/histogram_controller.h
+++ b/apps/statistics/histogram_controller.h
@@ -6,7 +6,7 @@
 #include "histogram_view.h"
 #include "histogram_banner_view.h"
 #include "histogram_parameter_controller.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/histogram_parameter_controller.h b/apps/statistics/histogram_parameter_controller.h
index 677e58554..f5e01bded 100644
--- a/apps/statistics/histogram_parameter_controller.h
+++ b/apps/statistics/histogram_parameter_controller.h
@@ -2,7 +2,7 @@
 #define STATISTICS_HISTOGRAM_PARAMETER_CONTROLLER_H
 
 #include <escher.h>
-#include "../float_parameter_controller.h"
+#include "../shared/float_parameter_controller.h"
 #include "store.h"
 
 namespace Statistics {
diff --git a/apps/statistics/histogram_view.h b/apps/statistics/histogram_view.h
index dbeb007a9..ec6c3bd02 100644
--- a/apps/statistics/histogram_view.h
+++ b/apps/statistics/histogram_view.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "store.h"
 #include "../constant.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/store.h b/apps/statistics/store.h
index 887eab591..059f3dba9 100644
--- a/apps/statistics/store.h
+++ b/apps/statistics/store.h
@@ -1,8 +1,8 @@
 #ifndef STATISTICS_STORE_H
 #define STATISTICS_STORE_H
 
-#include "../memoized_curve_view_range.h"
-#include "../float_pair_store.h"
+#include "../shared/memoized_curve_view_range.h"
+#include "../shared/float_pair_store.h"
 
 namespace Statistics {
 
diff --git a/apps/statistics/store_controller.h b/apps/statistics/store_controller.h
index cd76a3829..82d8cbda2 100644
--- a/apps/statistics/store_controller.h
+++ b/apps/statistics/store_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher.h>
 #include "store.h"
-#include "../store_controller.h"
+#include "../shared/store_controller.h"
 
 namespace Statistics {