diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..c9a8372b2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# EditorConfig <http://EditorConfig.org>
+root = true
+
+# elementary defaults
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = tab
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+tab_width = 4
+
+[{*.policy,*.xml,*.xml.in,*.yml}]
+tab_width = 2
diff --git a/elementary.gpl b/data/elementary.gpl
similarity index 100%
rename from elementary.gpl
rename to data/elementary.gpl
diff --git a/data/icons.appdata.xml.in b/data/icons.appdata.xml.in
new file mode 100644
index 000000000..725943f43
--- /dev/null
+++ b/data/icons.appdata.xml.in
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 elementary, Inc. <contact@elementary.io> -->
+<component type="icon-theme">
+  <id>io.elementary.icons</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+​  <name>elementary Icons</name>
+​  <summary>Named, vector icons for elementary OS</summary>
+​  <description>
+​    <p>An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon.</p>
+​  </description>
+  <releases>
+    <release version="5.1.0" date="2019-10-31" urgency="medium">
+      <description>
+        <ul>
+          <li>Add 64px prefs locale</li>
+          <li>Make symbol on 32px places home larger</li>
+          <li>New icons for Workspace preferences</li>
+          <li>Add symbolic variant for updates icon</li>
+          <li>Give browser-download its own unique icon</li>
+          <li>Use a more scalable metaphor for system updates</li>
+          <li>New view-reader icon</li>
+          <li>Add 32px wireless signal icons</li>
+          <li>Add 24px user status icons</li>
+        </ul>
+      </description>
+    </release>
+  </releases>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">none</content_attribute>
+    <content_attribute id="violence-fantasy">none</content_attribute>
+    <content_attribute id="violence-realistic">none</content_attribute>
+    <content_attribute id="violence-bloodshed">none</content_attribute>
+    <content_attribute id="violence-sexual">none</content_attribute>
+    <content_attribute id="violence-desecration">none</content_attribute>
+    <content_attribute id="violence-slavery">none</content_attribute>
+    <content_attribute id="violence-worship">none</content_attribute>
+    <content_attribute id="drugs-alcohol">none</content_attribute>
+    <content_attribute id="drugs-narcotics">none</content_attribute>
+    <content_attribute id="drugs-tobacco">none</content_attribute>
+    <content_attribute id="sex-nudity">none</content_attribute>
+    <content_attribute id="sex-themes">none</content_attribute>
+    <content_attribute id="sex-homosexuality">none</content_attribute>
+    <content_attribute id="sex-prostitution">none</content_attribute>
+    <content_attribute id="sex-adultery">none</content_attribute>
+    <content_attribute id="sex-appearance">none</content_attribute>
+    <content_attribute id="language-profanity">none</content_attribute>
+    <content_attribute id="language-humor">none</content_attribute>
+    <content_attribute id="language-discrimination">none</content_attribute>
+    <content_attribute id="social-chat">none</content_attribute>
+    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-audio">none</content_attribute>
+    <content_attribute id="social-location">none</content_attribute>
+    <content_attribute id="social-contacts">none</content_attribute>
+    <content_attribute id="money-purchasing">none</content_attribute>
+    <content_attribute id="money-gambling">none</content_attribute>
+  </content_rating>
+  <translation type="gettext">io.elementary.icons</translation>
+  <compulsory_for_desktop>Pantheon</compulsory_for_desktop>
+  <developer_name>elementary, Inc.</developer_name>
+  <url type="homepage">https://elementary.io</url>
+  <url type="bugtracker">https://github.com/elementary/icons/issues</url>
+​</component>
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 000000000..d6c35687a
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,20 @@
+i18n.merge_file(
+    input: 'icons.appdata.xml.in',
+    output: meson.project_name() + '.appdata.xml',
+    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    type: 'xml',
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'metainfo'),
+)
+
+if (get_option ('palettes'))
+    install_data(
+        'elementary.gpl',
+        install_dir: join_paths (get_option('datadir'), 'gimp', '2.0', 'palettes')
+    )
+
+    install_data(
+        'elementary.gpl',
+        install_dir: join_paths (get_option('datadir'), 'inkscape', 'palettes')
+    )
+endif
diff --git a/meson.build b/meson.build
index d5c251b21..51c959e00 100644
--- a/meson.build
+++ b/meson.build
@@ -1,17 +1,16 @@
 project (
-    'elementary',
-    version: '5.0.4',
+    'io.elementary.icons',
+    version: '5.1.0',
     license : 'GPL3+'
 )
 
+i18n = import('i18n')
 
-icon_dir = join_paths(get_option('datadir'), 'icons', meson.project_name())
-
+icon_dir = join_paths(get_option('datadir'), 'icons', 'elementary')
 
 scale_factors = get_option('scale_factors')
 
 # Add a directory here to the list if needed.
-
 directories = [
     # The first argument is the name of the folder,
     # the second is the associated Context
@@ -26,23 +25,18 @@ directories = [
     ['status', 'Status']
 ]
 
-# Add a directory here to the list if needed.
-
+# Add a size here to the list if needed.
 sizes = ['16', '24', '32', '48', '64', '128', 'symbolic']
 
 # Symbolic icons are made to have a maximum size.
-
 max_size_symbolic = '512'
 
 # This is the minimal size all icons can theorically have.
-
 min_size_ever = '8'
 
 # Let's do fancy things
-
 msg_warning = false
-msg = 'This is the @0@ stylesheet version @1@ 🤩\n'.format (meson.project_name(), meson.project_version())
-msg += '\nPLEASE VERIFY THE CONFIGURATION:'
+msg = '\nPLEASE VERIFY THE CONFIGURATION:'
 
 if (sizes.length() >= 7)
     msg += '\nAvailable sizes:           @0@ ✔'.format (', '.join (sizes))
@@ -72,7 +66,6 @@ else
 endif
 
 # Here beggins the real work
-
 foreach directory : directories
     install_subdir(
         directory[0],
@@ -179,19 +172,10 @@ foreach directory_entry : directories
     endforeach
 endforeach
 
-if (get_option ('palettes'))
-    install_data(
-        'elementary.gpl',
-        install_dir: join_paths (get_option('datadir'), 'gimp', '2.0', 'palettes')
-    )
-
-    install_data(
-        'elementary.gpl',
-        install_dir: join_paths (get_option('datadir'), 'inkscape', 'palettes')
-    )
-endif
-
 subdir('cursors')
+
 if (get_option ('volume_icons'))
   subdir('volumeicon')
 endif
+
+subdir('data')