diff --git a/test-app/app/components/decorator-example1/component.js b/test-app/app/components/decorator-example1/index.js
similarity index 100%
rename from test-app/app/components/decorator-example1/component.js
rename to test-app/app/components/decorator-example1/index.js
diff --git a/test-app/app/components/decorator-example2/component.js b/test-app/app/components/decorator-example2/index.js
similarity index 100%
rename from test-app/app/components/decorator-example2/component.js
rename to test-app/app/components/decorator-example2/index.js
diff --git a/test-app/app/components/decorator-example3/component.js b/test-app/app/components/decorator-example3/index.js
similarity index 100%
rename from test-app/app/components/decorator-example3/component.js
rename to test-app/app/components/decorator-example3/index.js
diff --git a/test-app/app/components/decorator-example4/component.js b/test-app/app/components/decorator-example4/index.js
similarity index 100%
rename from test-app/app/components/decorator-example4/component.js
rename to test-app/app/components/decorator-example4/index.js
diff --git a/test-app/app/templates/components/key-down-counter.hbs b/test-app/app/components/key-down-counter.hbs
similarity index 100%
rename from test-app/app/templates/components/key-down-counter.hbs
rename to test-app/app/components/key-down-counter.hbs
diff --git a/test-app/app/templates/components/mouse-down-counter.hbs b/test-app/app/components/mouse-down-counter.hbs
similarity index 100%
rename from test-app/app/templates/components/mouse-down-counter.hbs
rename to test-app/app/components/mouse-down-counter.hbs
diff --git a/test-app/app/templates/components/touch-start-counter.hbs b/test-app/app/components/touch-start-counter.hbs
similarity index 100%
rename from test-app/app/templates/components/touch-start-counter.hbs
rename to test-app/app/components/touch-start-counter.hbs
diff --git a/test-app/app/templates/components/trigger-event-widget.hbs b/test-app/app/components/trigger-event-widget.hbs
similarity index 100%
rename from test-app/app/templates/components/trigger-event-widget.hbs
rename to test-app/app/components/trigger-event-widget.hbs