diff --git a/histogram.cpp b/histogram.cpp
new file mode 100644
index 0000000..0c923b3
--- /dev/null
+++ b/histogram.cpp
@@ -0,0 +1,49 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+
+using namespace std;
+
+static void find_minmax(const vector <double> &numbers, double &min, double &max)
+{
+    min = numbers[0];
+    max = numbers[0];
+    for (double x : numbers)
+    {
+        if (x < min)
+        {
+            min = x;
+        }
+        else if (x > max)
+        {
+            max = x;
+        }
+    }
+}
+vector<size_t> make_histogram(const vector<double> &numbers, size_t bin_count)
+{
+    double min, max;
+    find_minmax(numbers, min, max);
+    double bin_size = (max - min) / bin_count;
+    vector <size_t> bins (bin_count);
+
+    for (size_t i = 0; i < numbers.size(); i++)
+    {
+        bool found = false;
+        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
+        {
+            auto lo = min + j * bin_size;
+            auto hi = min + (j+1) * bin_size;
+            if ((lo <= numbers[i]) && (numbers[i] < hi))
+            {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found)
+        {
+            bins[bin_count - 1]++;
+        }
+    }
+    return bins;
+}
diff --git a/histogram.h b/histogram.h
new file mode 100644
index 0000000..90ba544
--- /dev/null
+++ b/histogram.h
@@ -0,0 +1,4 @@
+#pragma once
+#include <vector>
+
+std::vector<std::size_t> make_histogram(const std::vector<double>& numbers, std::size_t bin_count);
diff --git a/lab03.cbp b/lab03.cbp
index 0f4c835..51d15cc 100644
--- a/lab03.cbp
+++ b/lab03.cbp
@@ -32,7 +32,15 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>
diff --git a/main.cpp b/main.cpp
index c14a7a7..195afcf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,8 @@
 #include <iostream>
 #include <vector>
-#include <cstdlib>
+#include "histogram.h"
+#include "text.h"
+
 using namespace std;
 struct Input
 {
@@ -30,101 +32,9 @@ input_data()
     return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& min, double& max)
-{
-    min = numbers[0];
-    for (size_t i = 1; i < numbers.size(); i++)
-    {
-        if (numbers[i] < min)
-        {
-            min = numbers[i];
-        }
-        else if (numbers[i] > max)
-        {
-            max = numbers[i];
-        }
-    }
-}
-
-vector<size_t> make_histogram(const vector<double>& numbers,size_t bin_count) {
-    vector<size_t> bins(bin_count, 0);
-    double min, max;
-    find_minmax(numbers, min, max);
-
-    double bin_size = (max - min) / bin_count;
-    if (bin_size == 0) bin_size = 1;
-
-    for (double num : numbers) {
-        bool found = false;
-        for (size_t i = 0; i < bin_count - 1; ++i) {
-            double lo = min + i * bin_size;
-            double hi = lo + bin_size;
-            if (lo <= num && num < hi) {
-                bins[i]++;
-                found = true;
-                break;
-            }
-        }
-        if (!found) bins.back()++;
-    }
-    return bins;
-}
-void show_histogram_text(const vector<size_t>& bins, size_t& bin_count, double bin_size)
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    size_t max_bin_count = bins[0];
-    for(size_t i = 0; i < bin_count; i++)
-    {
-        if(bins[i] > max_bin_count)
-        {
-            max_bin_count = bins[i];
-        }
-    }
-
-    for(size_t i = 0; i < bin_count; i++)
-    {
-        if(bins[i]<10)
-        {
-            cout<< "  " << bins[i] << "|";
-        }
-        else
-        {
-            if(bins[i]<100)
-            {
-                cout<< " " << bins[i] << "|";
-            }
-            else
-            {
-                if(bins[i]<1000)
-                {
-                    cout<< bins[i] << "|";
-                }
-
-            }
-        }
-
-        size_t height;
-        if(max_bin_count <= MAX_ASTERISK)
-        {
-            height = bins[i];
-        }
-        else
-        {
-            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_count);
-        }
-        for(size_t j = 0; j < height;  j ++)
-        {
-            cout<<"*";
-        }
-        cout<<endl;
-    }
-}
-
 int main()
 {
-    auto in = input_data();
+    Input in = input_data();
    auto bins = make_histogram(in.numbers, in.bin_count);
 
    double min, max;
diff --git a/text.cpp b/text.cpp
new file mode 100644
index 0000000..ebeb410
--- /dev/null
+++ b/text.cpp
@@ -0,0 +1,58 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+#include "text.h"
+
+using namespace std;
+
+void show_histogram_text(const vector<size_t>& bins, size_t& bin_count, double bin_size)
+{
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    size_t max_bin_count = bins[0];
+    for(size_t i = 0; i < bin_count; i++)
+    {
+        if(bins[i] > max_bin_count)
+        {
+            max_bin_count = bins[i];
+        }
+    }
+
+    for(size_t i = 0; i < bin_count; i++)
+    {
+        if(bins[i]<10)
+        {
+            cout<< "  " << bins[i] << "|";
+        }
+        else
+        {
+            if(bins[i]<100)
+            {
+                cout<< " " << bins[i] << "|";
+            }
+            else
+            {
+                if(bins[i]<1000)
+                {
+                    cout<< bins[i] << "|";
+                }
+
+            }
+        }
+
+        size_t height;
+        if(max_bin_count <= MAX_ASTERISK)
+        {
+            height = bins[i];
+        }
+        else
+        {
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_count);
+        }
+        for(size_t j = 0; j < height;  j ++)
+        {
+            cout<<"*";
+        }
+        cout<<endl;
+    }
+}
diff --git a/text.h b/text.h
new file mode 100644
index 0000000..474aa9d
--- /dev/null
+++ b/text.h
@@ -0,0 +1,5 @@
+#pragma once
+#include <vector>
+
+void show_histogram_text(const std::vector<std::size_t>& bins, std::size_t& bin_count, double bin_size);
+