diff --git a/kallithea/bin/kallithea_cli_front_end.py b/kallithea/bin/kallithea_cli_front_end.py
--- a/kallithea/bin/kallithea_cli_front_end.py
+++ b/kallithea/bin/kallithea_cli_front_end.py
@@ -57,7 +57,7 @@ def front_end_build(install_deps, genera
                     '-a', '.code-highlight'],
                     stdout=f)
         lesscpath = os.path.join(front_end_dir, 'node_modules', '.bin', 'lessc')
-        lesspath = os.path.join(public_dir, 'less', 'main.less')
+        lesspath = os.path.join(front_end_dir, 'main.less')
         csspath = os.path.join(public_dir, 'css', 'style.css')
         subprocess.check_call([lesscpath, '--source-map',
                 '--source-map-less-inline', lesspath, csspath],
diff --git a/kallithea/public/less/kallithea-diff.less b/kallithea/front-end/kallithea-diff.less
rename from kallithea/public/less/kallithea-diff.less
rename to kallithea/front-end/kallithea-diff.less
diff --git a/kallithea/public/less/kallithea-labels.less b/kallithea/front-end/kallithea-labels.less
rename from kallithea/public/less/kallithea-labels.less
rename to kallithea/front-end/kallithea-labels.less
diff --git a/kallithea/public/less/kallithea-select2.less b/kallithea/front-end/kallithea-select2.less
rename from kallithea/public/less/kallithea-select2.less
rename to kallithea/front-end/kallithea-select2.less
diff --git a/kallithea/public/less/kallithea-variables.less b/kallithea/front-end/kallithea-variables.less
rename from kallithea/public/less/kallithea-variables.less
rename to kallithea/front-end/kallithea-variables.less
diff --git a/kallithea/public/less/main.less b/kallithea/front-end/main.less
rename from kallithea/public/less/main.less
rename to kallithea/front-end/main.less
--- a/kallithea/public/less/main.less
+++ b/kallithea/front-end/main.less
@@ -15,7 +15,7 @@
 @import (less) "node_modules/select2/select2.css";
 @import (less) "node_modules/select2-bootstrap-css/select2-bootstrap.css";
 @import (less) "tmp/pygments.css";
-@import (less) "../fontello/css/kallithea.css";
+@import (less) "../public/fontello/css/kallithea.css";
 
 /* kallithea styles */
 @import "kallithea-variables.less";
diff --git a/kallithea/public/less/style.less b/kallithea/front-end/style.less
rename from kallithea/public/less/style.less
rename to kallithea/front-end/style.less
diff --git a/kallithea/public/less/3rd-party/mergely.css b/kallithea/public/less/3rd-party/mergely.css
deleted file mode 100644
--- a/kallithea/public/less/3rd-party/mergely.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2013 by Jamie Peabody, http://www.mergely.com
- * All rights reserved.
- * Version: 3.3.4 2013-11-02
- *
- * NOTE by bkuhn@sfconservancy.org for Kallithea:
- * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html
- */
-
-/* required */
-.mergely-column textarea { width: 80px; height: 200px; }
-.mergely-column { float: left; }
-.mergely-margin { float: left; }
-.mergely-canvas { float: left; width: 28px; }
-
-/* resizeable */
-.mergely-resizer { width: 100%; height: 100%; }
-
-/* style configuration */
-.mergely-column { border: 1px solid #ccc; }
-.mergely-active { border: 1px solid #a3d1ff; }
-
-.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
-.mergely.a.lhs.start.end,
-.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
-.mergely.a.rhs { background-color: #ddeeff; }
-.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }
-
-.mergely.d.lhs { background-color: #edc0c0; }
-.mergely.d.lhs.end,
-.mergely.d.rhs.start.end { border-bottom: 1px solid #ff7f7f; }
-.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ff7f7f; }
-.mergely.d.lhs.start { border-top: 1px solid #ff7f7f; }
-
-.mergely.c.lhs,
-.mergely.c.rhs { background-color: #fafafa; }
-.mergely.c.lhs.start,
-.mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
-.mergely.c.lhs.end,
-.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
-
-.mergely.ch.a.rhs { background-color: #ddeeff; }
-.mergely.ch.d.lhs { background-color: #edc0c0; text-decoration: line-through; color: #888; }