diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
index e5e8d76..0f39047 100644
--- a/core/modules/block/block.admin.inc
+++ b/core/modules/block/block.admin.inc
@@ -13,7 +13,7 @@
  * @see block_menu()
  */
 function block_admin_demo($theme = NULL) {
-  drupal_add_css(drupal_get_path('module', 'block') . '/block.admin.css');
+  drupal_add_css(drupal_get_path('module', 'block') . '/css/block.admin.skin.css');
   return '';
 }
 
diff --git a/core/modules/block/block.admin.css b/core/modules/block/css/block.admin.skin.css
similarity index 100%
rename from core/modules/block/block.admin.css
rename to core/modules/block/css/block.admin.skin.css
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 2203133..eae7482 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -194,7 +194,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) {
       ),
       // Add custom CSS.
       'css' => array(
-        $base . '/color.admin.css' => array(),
+        $base . '/css/color.admin.skin.css' => array(),
       ),
       // Add custom JavaScript.
       'js' => array(
diff --git a/core/modules/color/color.admin-rtl.css b/core/modules/color/css/color.admin.skin-rtl.css
similarity index 100%
rename from core/modules/color/color.admin-rtl.css
rename to core/modules/color/css/color.admin.skin-rtl.css
diff --git a/core/modules/color/color.admin.css b/core/modules/color/css/color.admin.skin.css
similarity index 100%
rename from core/modules/color/color.admin.css
rename to core/modules/color/css/color.admin.skin.css
diff --git a/core/modules/dblog/dblog-rtl.css b/core/modules/dblog/css/dblog.admin.skin-rtl.css
similarity index 100%
rename from core/modules/dblog/dblog-rtl.css
rename to core/modules/dblog/css/dblog.admin.skin-rtl.css
diff --git a/core/modules/dblog/dblog.css b/core/modules/dblog/css/dblog.admin.skin.css
similarity index 100%
rename from core/modules/dblog/dblog.css
rename to core/modules/dblog/css/dblog.admin.skin.css
diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module
index a0afcd4..5f5fed0 100644
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -90,7 +90,7 @@ function dblog_menu() {
  */
 function dblog_page_build(&$page) {
   if (arg(0) == 'admin' && arg(1) == 'reports') {
-    $page['#attached']['css'][] = drupal_get_path('module', 'dblog') . '/dblog.css';
+    $page['#attached']['css'][] = drupal_get_path('module', 'dblog') . '/css/dblog.admin.skin.css';
   }
 }
 
diff --git a/core/modules/entity_reference/css/entity_reference-rtl.admin.css b/core/modules/entity_reference/css/entity_reference.admin.skin-rtl.css
similarity index 100%
rename from core/modules/entity_reference/css/entity_reference-rtl.admin.css
rename to core/modules/entity_reference/css/entity_reference.admin.skin-rtl.css
diff --git a/core/modules/entity_reference/css/entity_reference.admin.css b/core/modules/entity_reference/css/entity_reference.admin.skin.css
similarity index 100%
rename from core/modules/entity_reference/css/entity_reference.admin.css
rename to core/modules/entity_reference/css/entity_reference.admin.skin.css
diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module
index fd51ff6..3ba3e51 100644
--- a/core/modules/entity_reference/entity_reference.module
+++ b/core/modules/entity_reference/entity_reference.module
@@ -257,7 +257,7 @@ function entity_reference_field_instance_settings_form($field, $instance, $form_
   $form = array(
     '#type' => 'container',
     '#attached' => array(
-      'css' => array(drupal_get_path('module', 'entity_reference') . '/css/entity_reference.admin.css'),
+      'css' => array(drupal_get_path('module', 'entity_reference') . '/css/entity_reference.admin.skin.css'),
     ),
     '#process' => array(
       '_entity_reference_field_instance_settings_ajax_process',
diff --git a/core/modules/field_ui/field_ui.admin-rtl.css b/core/modules/field_ui/css/field_ui.admin.skin-rtl.css
similarity index 100%
rename from core/modules/field_ui/field_ui.admin-rtl.css
rename to core/modules/field_ui/css/field_ui.admin.skin-rtl.css
diff --git a/core/modules/field_ui/field_ui.admin.css b/core/modules/field_ui/css/field_ui.admin.skin.css
similarity index 100%
rename from core/modules/field_ui/field_ui.admin.css
rename to core/modules/field_ui/css/field_ui.admin.skin.css
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 9f64f5f..757bff9 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -417,7 +417,7 @@ function field_ui_library_info() {
       drupal_get_path('module', 'field_ui') . '/field_ui.js' => array(),
     ),
     'css' => array(
-      drupal_get_path('module', 'field_ui') . '/field_ui.admin.css' => array(),
+      drupal_get_path('module', 'field_ui') . '/css/field_ui.admin.skin.css' => array(),
     ),
     'dependencies' => array(
       array('system', 'jquery'),
diff --git a/core/modules/file/file.admin.css b/core/modules/file/css/file.admin.skin.css
similarity index 100%
rename from core/modules/file/file.admin.css
rename to core/modules/file/css/file.admin.skin.css
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 69fcbf3..9cd78b9 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -1603,7 +1603,7 @@ function file_library_info() {
       drupal_get_path('module', 'file') . '/file.js' => array(),
     ),
     'css' => array(
-      drupal_get_path('module', 'file') . '/file.admin.css'
+      drupal_get_path('module', 'file') . '/css/file.admin.skin.css'
     ),
     'dependencies' => array(
       array('system', 'jquery'),
diff --git a/core/modules/filter/filter.admin-rtl.css b/core/modules/filter/css/filter.admin.skin-rtl.css
similarity index 100%
rename from core/modules/filter/filter.admin-rtl.css
rename to core/modules/filter/css/filter.admin.skin-rtl.css
diff --git a/core/modules/filter/filter.admin.css b/core/modules/filter/css/filter.admin.skin.css
similarity index 100%
rename from core/modules/filter/filter.admin.css
rename to core/modules/filter/css/filter.admin.skin.css
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 8ee1871..f57e191 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -1855,7 +1855,7 @@ function filter_library_info() {
       drupal_get_path('module', 'filter') . '/filter.admin.js' => array(),
     ),
     'css' => array(
-      drupal_get_path('module', 'filter') . '/filter.admin.css'
+      drupal_get_path('module', 'filter') . '/css/filter.admin.skin.css'
     ),
     'dependencies' => array(
       array('system', 'jquery'),
@@ -1871,7 +1871,7 @@ function filter_library_info() {
       drupal_get_path('module', 'filter') . '/filter.js' => array(),
     ),
     'css' => array(
-      drupal_get_path('module', 'filter') . '/filter.admin.css'
+      drupal_get_path('module', 'filter') . '/css/filter.admin.skin.css'
     ),
     'dependencies' => array(
       array('system', 'jquery'),
diff --git a/core/modules/help/help-rtl.css b/core/modules/help/css/help.admin.skin-rtl.css
similarity index 100%
rename from core/modules/help/help-rtl.css
rename to core/modules/help/css/help.admin.skin-rtl.css
diff --git a/core/modules/help/help.css b/core/modules/help/css/help.admin.skin.css
similarity index 100%
rename from core/modules/help/help.css
rename to core/modules/help/css/help.admin.skin.css
diff --git a/core/modules/help/help.admin.inc b/core/modules/help/help.admin.inc
index a3bea9e..a0c3ae7 100644
--- a/core/modules/help/help.admin.inc
+++ b/core/modules/help/help.admin.inc
@@ -12,7 +12,7 @@
  */
 function help_main() {
   // Add CSS.
-  drupal_add_css(drupal_get_path('module', 'help') . '/help.css');
+  drupal_add_css(drupal_get_path('module', 'help') . '/css/help.admin.skin.css');
   $output = '<h2>' . t('Help topics') . '</h2><p>' . t('Help is available on the following items:') . '</p>' . help_links_as_list();
   return $output;
 }
diff --git a/core/modules/language/language.admin.css b/core/modules/language/css/language.admin.skin.css
similarity index 100%
rename from core/modules/language/language.admin.css
rename to core/modules/language/css/language.admin.skin.css
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index a3500fd..fa5f588 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -1002,7 +1002,7 @@ function language_content_settings_form(array $form, array $form_state, array $s
   $form = array(
     '#labels' => $labels,
     '#attached' => array(
-      'css' => array($path . '/language.admin.css'),
+      'css' => array($path . '/css/language.admin.css'),
     ),
   );
 
diff --git a/core/modules/layout/layout.admin.css b/core/modules/layout/css/layout.admin.skin.css
similarity index 100%
rename from core/modules/layout/layout.admin.css
rename to core/modules/layout/css/layout.admin.skin.css
diff --git a/core/modules/layout/layout.admin.inc b/core/modules/layout/layout.admin.inc
index 9a1a921..7046e89 100644
--- a/core/modules/layout/layout.admin.inc
+++ b/core/modules/layout/layout.admin.inc
@@ -70,6 +70,6 @@ function layout_page_view($key) {
     '#type' => 'markup',
     '#markup' => $instance->renderLayout(TRUE, $regions),
   );
-  $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/layout.admin.css';
+  $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.skin.css';
   return $build;
 }
diff --git a/core/modules/locale/locale-rtl.css b/core/modules/locale/css/locale.admin.skin-rtl.css
similarity index 100%
rename from core/modules/locale/locale-rtl.css
rename to core/modules/locale/css/locale.admin.skin-rtl.css
diff --git a/core/modules/locale/locale.admin.css b/core/modules/locale/css/locale.admin.skin.css
similarity index 100%
rename from core/modules/locale/locale.admin.css
rename to core/modules/locale/css/locale.admin.skin.css
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 4366871..498ba33 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -163,7 +163,7 @@ function locale_translate_filter_form($form, &$form_state) {
   $filter_values = locale_translate_filter_values();
 
   $form['#attached']['css'] = array(
-    drupal_get_path('module', 'locale') . '/locale.admin.css',
+    drupal_get_path('module', 'locale') . '/css/locale.admin.skin.css',
   );
 
   $form['filters'] = array(
@@ -260,7 +260,7 @@ function locale_translate_edit_form($form, &$form_state) {
 
   $path = drupal_get_path('module', 'locale');
   $form['#attached']['css'] = array(
-    $path . '/locale.admin.css',
+    $path . '/css/locale.admin.skin.css',
   );
   $form['#attached']['library'][] = array('locale', 'drupal.locale.admin');
 
@@ -703,7 +703,7 @@ function locale_translation_status_form($form, &$form_state) {
   );
 
   $form['#attached']['library'][] = array('locale', 'drupal.locale.admin');
-  $form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/locale.admin.css');
+  $form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/css/locale.admin.skin.css');
 
   $form['actions'] = array('#type' => 'actions');
   if ($languages_update) {
diff --git a/core/modules/menu/menu.admin.css b/core/modules/menu/css/menu.admin.skin.css
similarity index 100%
rename from core/modules/menu/menu.admin.css
rename to core/modules/menu/css/menu.admin.skin.css
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index a04fca5..cbfb413 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -70,7 +70,7 @@ function menu_overview_form($form, &$form_state) {
   $form['#theme'] = 'menu_overview_form';
   $form_state += array('menu_overview_form_parents' => array());
 
-  $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/menu.admin.css');
+  $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/css/menu.admin.skin.css');
 
   $links = array();
   $query = entity_query('menu_link')
diff --git a/core/modules/translation_entity/translation_entity.admin.css b/core/modules/translation_entity/css/translation_entity.admin.skin.css
similarity index 100%
rename from core/modules/translation_entity/translation_entity.admin.css
rename to core/modules/translation_entity/css/translation_entity.admin.skin.css
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index ac00322..e60caac 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -365,7 +365,7 @@ function translation_entity_library_info() {
       $path . '/translation_entity.admin.js' => array(),
     ),
     'css' => array(
-      $path . '/translation_entity.admin.css' => array(),
+      $path . '/css/translation_entity.admin.skin.css' => array(),
     ),
     'dependencies' => array(
       array('system', 'jquery'),
diff --git a/core/modules/update/update-rtl.css b/core/modules/update/css/update.admin.skin-rtl.css
similarity index 100%
rename from core/modules/update/update-rtl.css
rename to core/modules/update/css/update.admin.skin-rtl.css
diff --git a/core/modules/update/update.css b/core/modules/update/css/update.admin.skin.css
similarity index 100%
rename from core/modules/update/update.css
rename to core/modules/update/css/update.admin.skin.css
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index 0047a52..0e5bfcc 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -77,7 +77,7 @@ function update_manager_update_form($form, $form_state = array(), $context) {
     return $form;
   }
 
-  $form['#attached']['css'][] = drupal_get_path('module', 'update') . '/update.css';
+  $form['#attached']['css'][] = drupal_get_path('module', 'update') . '/css/update.admin.skin.css';
 
   // This will be a nested array. The first key is the kind of project, which
   // can be either 'enabled', 'disabled', 'manual' (projects which require
diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc
index 607b523..568b938 100644
--- a/core/modules/update/update.report.inc
+++ b/core/modules/update/update.report.inc
@@ -247,7 +247,7 @@ function theme_update_report($variables) {
       $output .= theme('table', array('header' => $header, 'rows' => $rows[$type_name], 'attributes' => array('class' => array('update'))));
     }
   }
-  drupal_add_css(drupal_get_path('module', 'update') . '/update.css');
+  drupal_add_css(drupal_get_path('module', 'update') . '/css/update.admin.skin.css');
   return $output;
 }