diff --git a/css/droidsans.css b/css/droidsans.css
new file mode 100644
index 0000000000000000000000000000000000000000..6aea06181f3f6d70b5fbf2ca174b5f12dc498f37
--- /dev/null
+++ b/css/droidsans.css
@@ -0,0 +1,41 @@
+@font-face {
+    font-family: 'Droid Sans';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../font/DroidSans-Regular.eot?1516549146');
+    src: local('Droid Sans Regular'),
+         local('DroidSans-Regular'),
+         url('../font/DroidSans-Regular.eot?1516549146#iefix') format('embedded-opentype'),
+         url('../font/DroidSans-Regular.woff2?1516549146') format('woff2'),
+         url('../font/DroidSans-Regular.woff?1516549146') format('woff'),
+         url('../font/DroidSans-Regular.ttf?1516549146') format('truetype'),
+         url('../font/DroidSans-Regular.svg?1516549146#droid_sansregular') format('svg');
+}
+
+@font-face {
+    font-family: 'Droid Sans';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../font/DroidSans-Bold.eot?1516549146');
+    src: local('Droid Sans Bold'),
+         local('DroidSans-Bold'),
+         url('../font/DroidSans-Bold.eot?1516549146#iefix') format('embedded-opentype'),
+         url('../font/DroidSans-Bold.woff2?1516549146') format('woff2'),
+         url('../font/DroidSans-Bold.woff?1516549146') format('woff'),
+         url('../font/DroidSans-Bold.ttf?1516549146') format('truetype'),
+         url('../font/DroidSans-Bold.svg?1516549146#droid_sansbold') format('svg');
+}
+
+@font-face {
+    font-family: 'Droid Sans Mono';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../font/DroidSansMono-Regular.eot?1516549146');
+    src: local('Droid Sans Mono Regular'),
+         local('DroidSansMono-Regular'),
+         url('../font/DroidSansMono-Regular.eot?1516549146#iefix') format('embedded-opentype'),
+         url('../font/DroidSansMono-Regular.woff2?1516549146') format('woff2'),
+         url('../font/DroidSansMono-Regular.woff?1516549146') format('woff'),
+         url('../font/DroidSansMono-Regular.ttf?1516549146') format('truetype'),
+         url('../font/DroidSansMono-Regular.svg?1516549146#droid_sans_monoregular') format('svg');
+}
diff --git a/fontello.css b/css/fontello.css
similarity index 76%
rename from fontello.css
rename to css/fontello.css
index 50ca754d7053258895f3cf61a943665447fbbf21..f7080abef766b3122e21ba845bbad8eeb272a002 100644
--- a/fontello.css
+++ b/css/fontello.css
@@ -1,11 +1,11 @@
 @font-face {
     font-family: 'fontello';
-    src: url('icon/fontello.eot?13793670');
-    src: url('icon/fontello.eot?13793670#iefix') format('embedded-opentype'),
-         url('icon/fontello.woff2?13793670') format('woff2'),
-         url('icon/fontello.woff?13793670') format('woff'),
-         url('icon/fontello.ttf?13793670') format('truetype'),
-         url('icon/fontello.svg?13793670#fontello') format('svg');
+    src: url('../icon/fontello.eot?13793670');
+    src: url('../icon/fontello.eot?13793670#iefix') format('embedded-opentype'),
+         url('../icon/fontello.woff2?13793670') format('woff2'),
+         url('../icon/fontello.woff?13793670') format('woff'),
+         url('../icon/fontello.ttf?13793670') format('truetype'),
+         url('../icon/fontello.svg?13793670#fontello') format('svg');
     font-weight: normal;
     font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
     @font-face {
         font-family: 'fontello';
-        src: url('icon/fontello.svg?13793670#fontello') format('svg');
+        src: url('../icon/fontello.svg?13793670#fontello') format('svg');
     }
 }
 */
diff --git a/style.css b/css/style.css
similarity index 100%
rename from style.css
rename to css/style.css
diff --git a/droidsans.css b/droidsans.css
deleted file mode 100644
index 2bf56f1adcbd6a056ee49307766962073e44c5a6..0000000000000000000000000000000000000000
--- a/droidsans.css
+++ /dev/null
@@ -1,41 +0,0 @@
-@font-face {
-    font-family: 'Droid Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url('font/DroidSans-Regular.eot?1516549146');
-    src: local('Droid Sans Regular'),
-         local('DroidSans-Regular'),
-         url('font/DroidSans-Regular.eot?1516549146#iefix') format('embedded-opentype'),
-         url('font/DroidSans-Regular.woff2?1516549146') format('woff2'),
-         url('font/DroidSans-Regular.woff?1516549146') format('woff'),
-         url('font/DroidSans-Regular.ttf?1516549146') format('truetype'),
-         url('font/DroidSans-Regular.svg?1516549146#droid_sansregular') format('svg');
-}
-
-@font-face {
-    font-family: 'Droid Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url('font/DroidSans-Bold.eot?1516549146');
-    src: local('Droid Sans Bold'),
-         local('DroidSans-Bold'),
-         url('font/DroidSans-Bold.eot?1516549146#iefix') format('embedded-opentype'),
-         url('font/DroidSans-Bold.woff2?1516549146') format('woff2'),
-         url('font/DroidSans-Bold.woff?1516549146') format('woff'),
-         url('font/DroidSans-Bold.ttf?1516549146') format('truetype'),
-         url('font/DroidSans-Bold.svg?1516549146#droid_sansbold') format('svg');
-}
-
-@font-face {
-    font-family: 'Droid Sans Mono';
-    font-style: normal;
-    font-weight: 400;
-    src: url('font/DroidSansMono-Regular.eot?1516549146');
-    src: local('Droid Sans Mono Regular'),
-         local('DroidSansMono-Regular'),
-         url('font/DroidSansMono-Regular.eot?1516549146#iefix') format('embedded-opentype'),
-         url('font/DroidSansMono-Regular.woff2?1516549146') format('woff2'),
-         url('font/DroidSansMono-Regular.woff?1516549146') format('woff'),
-         url('font/DroidSansMono-Regular.ttf?1516549146') format('truetype'),
-         url('font/DroidSansMono-Regular.svg?1516549146#droid_sans_monoregular') format('svg');
-}
diff --git a/index.twig b/index.twig
index 4484a762a572c3449c9b01e1dbada91e91b9c772..4f527f9026e6ad9d7a95b868a012b5ed8d5e4008 100644
--- a/index.twig
+++ b/index.twig
@@ -15,9 +15,9 @@
         <link rel="canonical" href="{{ current_page.url }}" />
     {% endif %}
 
-    <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
-    <link rel="stylesheet" href="{{ theme_url }}/droidsans.css" type="text/css" />
-    <link rel="stylesheet" href="{{ theme_url }}/fontello.css" type="text/css" />
+    <link rel="stylesheet" href="{{ theme_url }}/css/style.css" type="text/css" />
+    <link rel="stylesheet" href="{{ theme_url }}/css/droidsans.css" type="text/css" />
+    <link rel="stylesheet" href="{{ theme_url }}/css/fontello.css" type="text/css" />
 </head>
 <body{% if config.theme_config.widescreen %} class="widescreen"{% endif %}>