diff --git a/src/client/api/news.js b/src/client/api/news.js
index 7433df61..99690b12 100644
--- a/src/client/api/news.js
+++ b/src/client/api/news.js
@@ -2,7 +2,7 @@
  * Created by tmshv on 22/11/14.
  */
 
-var query = require("../../utils/net").query;
+import {query} from '../../utils/net';
 
 function APIFeed(http){
     this.request = http;
diff --git a/src/client/modules/schedule.js b/src/client/modules/schedule.js
index 9eec6b62..9aae7a42 100644
--- a/src/client/modules/schedule.js
+++ b/src/client/modules/schedule.js
@@ -1,4 +1,4 @@
-var getDates = require('../../utils/date').getDates;
+import {getDates} from '../../utils/date';
 
 module.exports = angular.module('hudozka.schedule', [])
     .directive('schedule', function ($compile) {
diff --git a/src/client/pages/schedule.js b/src/client/pages/schedule.js
index 97f916b3..87802c46 100644
--- a/src/client/pages/schedule.js
+++ b/src/client/pages/schedule.js
@@ -1,5 +1,5 @@
-var populate = require('../../utils/populate').populate;
-const course = require('../../models/course');
+import {populate} from '../../utils/populate';
+import {getCourseNameByID} from '../../models/course';
 
 function indexEquals(i) {
     return function (_, index) {
@@ -59,7 +59,7 @@ module.exports = function (app) {
                     .success(function (scheduleRecord) {
                         $scope.groups = scheduleData.populate(scheduleRecord.schedule, [
                             populate(team.short, 'teacher'),
-                            populate(course.name, 'lesson')
+                            populate(getCourseNameByID, 'lesson')
                         ]);
 
                         if (updateURL) {
diff --git a/src/client/pages/team.js b/src/client/pages/team.js
index 101e3e0a..6238ceb2 100644
--- a/src/client/pages/team.js
+++ b/src/client/pages/team.js
@@ -1,5 +1,4 @@
 var populate = require('../../utils/populate').populate;
-const course = require('../../models/course');
 
 module.exports = function (app) {
     app.controller('TeamPageController', function ($scope, team) {
diff --git a/src/config.js b/src/config.js
index 5a990063..1c3354c2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -3,7 +3,7 @@ var path = require("path");
 const MENU = require("./models/menu");
 
 const team = require("./models/team");
-const course = require("./models/course");
+import {courses} from "./models/course";
 const document = require("./models/document");
 const schedule = require("./models/schedule");
 
@@ -20,7 +20,7 @@ var config = {
         menu: MENU,
         documents: document.docs,
         team: team.team,
-        courses: course.courses
+        courses: courses
     },
 
     db: {
diff --git a/src/models/course.js b/src/models/course.js
index 4d982f9d..b38d5288 100644
--- a/src/models/course.js
+++ b/src/models/course.js
@@ -1,4 +1,4 @@
-const COURSES = [
+export const courses = [
 	{
 		"id": "painting",
 		"name": "Живопись"
@@ -29,13 +29,9 @@ const COURSES = [
 	}
 ];
 
-exports.courses = COURSES;
-exports.course = getCourseByID;
-exports.name = getCourseNameByID;
-
-function getCourseByID(id){
-	for(var i=0; i<COURSES.length; i++){
-		var p = COURSES[i];
+export function getCourseByID(id){
+	for(var i=0; i<courses.length; i++){
+		var p = courses[i];
 		if(p.id == id){
 			return p;
 		}
@@ -43,7 +39,7 @@ function getCourseByID(id){
 	return null;
 }
 
-function getCourseNameByID(id){
+export function getCourseNameByID(id){
 	var p = getCourseByID(id);
 	if(p) return p.name;
 	else return null;
diff --git a/src/routes/schedule.js b/src/routes/schedule.js
index dfecfab1..88e580b4 100644
--- a/src/routes/schedule.js
+++ b/src/routes/schedule.js
@@ -7,7 +7,7 @@ var router = require("./");
 var db = require("../core/db");
 var schedule = require("../models/schedule");
 var populate = require("../utils/populate").populate;
-const course = require("../models/course");
+import {getCourseNameByID} from "../models/course";
 const team = require("../models/team");
 
 module.exports = function (app) {
@@ -35,7 +35,7 @@ module.exports = function (app) {
                     if(doPopulate) {
                         data.schedule = schedule.populate(data.schedule, [
                             populate(team.short, "teacher"),
-                            populate(course.name, "lesson")
+                            populate(getCourseNameByID, "lesson")
                         ]);
                     }
 
diff --git a/src/utils/common.js b/src/utils/common.js
index 069781b3..0178cd45 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1,7 +1,3 @@
-module.exports = {
-    range: range
-};
-
 /**
  * Generates list of numbers
  * @param  {Number} start starting value
@@ -9,7 +5,7 @@ module.exports = {
  * @param  {Number} step  difference value
  * @return {Array}        list of numbers
  */
-function range(start, num, step) {
+export function range(start, num, step) {
     var list = [];
     var val = start;
     for (var i = 0; i < num; i++) {
diff --git a/src/utils/date.js b/src/utils/date.js
index 391f4610..ea7648db 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -1,15 +1,11 @@
-var range = require('./common').range;
-
-module.exports = {
-    getDates: getDates
-};
+import {range} from './common';
 
 /**
  *
  * @param start
  * @returns {*}
  */
-function getDates(start) {
+export function getDates(start) {
     var day = start.getDay();
     return range(0, 6, 1).reduce(function (dates, weekDay) {
         var d = 1 + weekDay - day;
diff --git a/src/utils/net.js b/src/utils/net.js
index 703dc7a8..73a9165d 100644
--- a/src/utils/net.js
+++ b/src/utils/net.js
@@ -2,14 +2,12 @@
  * Created by tmshv on 08/03/15.
  */
 
-module.exports = {
-    query: function(list){
-        var params = list.reduce(function (query, param) {
-                var q = param[0] + "=" + param[1];
-                query.push(q);
-                return query;
-            }, [])
-            .join("&");
-        return params
-    }
-};
\ No newline at end of file
+export function query(list) {
+    var params = list.reduce(function (query, param) {
+            var q = param[0] + "=" + param[1];
+            query.push(q);
+            return query;
+        }, [])
+        .join("&");
+    return params
+}
diff --git a/src/utils/populate.js b/src/utils/populate.js
index 7c473669..2582db30 100644
--- a/src/utils/populate.js
+++ b/src/utils/populate.js
@@ -1,7 +1,4 @@
-exports.pop = pop;
-exports.populate = populate;
-
-function pop(data){
+export function pop(data){
 	var Populator = function(data){
 		this.target = data;
 	}
@@ -28,7 +25,7 @@ function pop(data){
 	return fun;
 }
 
-function populate(find, field){
+export function populate(find, field){
 	return function(lesson){
 		var id = lesson[field];
 		var val = find(id);