diff --git a/_devices/motorolamotog2015.markdown b/_devices/motorolamotog2015.markdown
new file mode 100644
index 0000000..438932a
--- /dev/null
+++ b/_devices/motorolamotog2015.markdown
@@ -0,0 +1,21 @@
+---
+layout: device
+title:  "Motorola Moto G 2015"
+codename: osprey
+downloadfolder: osprey
+supportstatus: Current
+maintainer: Dees_Troy
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/motorolamotog2016.markdown b/_devices/motorolamotog2016.markdown
index d7ccde2..78fe8c5 100644
--- a/_devices/motorolamotog2016.markdown
+++ b/_devices/motorolamotog2016.markdown
@@ -1,10 +1,10 @@
 ---
 layout: device
 title:  "Motorola Moto G 2016"
-codename: athene
-downloadfolder: athene
+codename: harpia
+downloadfolder: harpia
 supportstatus: Current
-maintainer: yeshwanthvshenoy, pranav01
+maintainer: Dees_Troy
 oem: Motorola
 ---
 
diff --git a/_devices/motorolamotogplus2016.markdown b/_devices/motorolamotogplus2016.markdown
new file mode 100644
index 0000000..dc4741f
--- /dev/null
+++ b/_devices/motorolamotogplus2016.markdown
@@ -0,0 +1,21 @@
+---
+layout: device
+title:  "Motorola Moto G Plus 2016"
+codename: athene
+downloadfolder: athene
+supportstatus: Current
+maintainer: yeshwanthvshenoy, pranav01
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}