diff --git a/addon/components/paper-content.js b/addon/components/paper-content.js
deleted file mode 100644
index da355252e..000000000
--- a/addon/components/paper-content.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @module ember-paper
- */
-import Component from '@ember/component';
-
-/**
- * @class PaperContent
- * @extends Ember.Component
- */
-export default Component.extend({
-  tagName: 'md-content',
-  classNames: ['md-default-theme'],
-  attributeBindings: ['layout-padding', 'scroll-y:md-scroll-y'],
-  classNameBindings: ['padding:md-padding']
-});
diff --git a/addon/components/paper-content/component.js b/addon/components/paper-content/component.js
new file mode 100644
index 000000000..f5b4f178b
--- /dev/null
+++ b/addon/components/paper-content/component.js
@@ -0,0 +1,16 @@
+/**
+ * @module ember-paper
+ */
+import Component from '@ember/component';
+import { tagName, layout } from '@ember-decorators/component';
+import template from './template';
+
+/**
+ * @class PaperContent
+ * @extends Component
+ */
+@tagName('')
+@layout(template)
+class PaperContent extends Component {}
+
+export default PaperContent;
diff --git a/addon/components/paper-content/template.hbs b/addon/components/paper-content/template.hbs
new file mode 100644
index 000000000..0452927be
--- /dev/null
+++ b/addon/components/paper-content/template.hbs
@@ -0,0 +1,6 @@
+<md-content
+  class="md-default-theme {{if @padding "md-padding"}}"
+  md-scroll-y={{@scroll-y}}
+  ...attributes>
+  {{yield}}
+</md-content>
\ No newline at end of file
diff --git a/app/components/paper-content.js b/app/components/paper-content.js
index 88db7ffc6..2bd96e8ea 100644
--- a/app/components/paper-content.js
+++ b/app/components/paper-content.js
@@ -1,3 +1 @@
-import PaperContent from 'ember-paper/components/paper-content';
-
-export default PaperContent;
+export { default } from 'ember-paper/components/paper-content/component';