diff --git a/lib/app/store.js b/lib/app/store.js
index f007d1d358..d4b162cb0d 100644
--- a/lib/app/store.js
+++ b/lib/app/store.js
@@ -34,10 +34,43 @@ if (typeof storeData !== 'function') {
     if (name === 'index') continue
 
     let namePath = name.split(/\//)
-    let module = getModuleNamespace(storeData, namePath)
 
+    name = namePath[namePath.length-1]
+    if (name === 'state' || name === 'getters' || name === 'actions' || name === 'mutations') {
+      let module = getModuleNamespace(storeData, namePath, true)
+      appendModule(module, filename, name)
+      continue
+    }
+
+    //if file is foo/index.js
+    //it should save as foo
+    let isIndex = (name === 'index')
+    if (isIndex)
+      namePath.pop()
+
+    let module      = getModuleNamespace(storeData, namePath)
+    let fileModule  = getModule(filename)
     name = namePath.pop()
-    module[name] = getModule(filename)
+    module[name] = module[name] || {}
+
+    //if file is foo.js, existing properties take priority
+    //because it's the least specific case
+    if (!isIndex) {
+      module[name] = Object.assign({}, fileModule, module[name])
+      module[name].namespaced = true
+      continue
+    }
+
+    //if file is foo/index.js we want to overwrite properties from foo.js
+    //but not from appended mods like foo/actions.js
+    var appendedMods = {}
+    if (module[name].appends) {
+      appendedMods.appends = module[name].appends
+      for (let append of module[name].appends)
+        appendedMods[append] = module[name][append]
+    }
+
+    module[name] = Object.assign({}, module[name], fileModule, appendedMods)
     module[name].namespaced = true
   }
 
@@ -65,13 +98,22 @@ function getModule (filename) {
   return module
 }
 
-function getModuleNamespace (storeData, namePath) {
+function getModuleNamespace (storeData, namePath, forAppend = false) {
   if (namePath.length === 1) {
+    if (forAppend)
+      return storeData
     return storeData.modules
   }
   let namespace = namePath.shift()
   storeData.modules[namespace] = storeData.modules[namespace] || {}
   storeData.modules[namespace].namespaced = true
   storeData.modules[namespace].modules = storeData.modules[namespace].modules || {}
-  return getModuleNamespace(storeData.modules[namespace], namePath)
+  return getModuleNamespace(storeData.modules[namespace], namePath, forAppend)
+}
+
+function appendModule(module, filename, name) {
+  const file = files(filename)
+  module.appends = module.appends || []
+  module.appends.push(name)
+  module[name] = file.default || file
 }
diff --git a/test/basic.csr.test.js b/test/basic.csr.test.js
new file mode 100644
index 0000000000..e5848df54d
--- /dev/null
+++ b/test/basic.csr.test.js
@@ -0,0 +1,226 @@
+import test from 'ava'
+import { resolve } from 'path'
+import { Nuxt, Builder } from '..'
+import * as browser from './helpers/browser'
+import { interceptLog } from './helpers/console'
+
+const port = 4003
+const url = route => 'http://localhost:' + port + route
+
+let nuxt = null
+let page = null
+
+// Init nuxt.js and create server listening on localhost:4003
+test.serial('Init Nuxt.js', async t => {
+  const options = {
+    rootDir: resolve(__dirname, 'fixtures/basic'),
+    buildDir: '.nuxt-csr',
+    dev: true,
+    head: {
+      titleTemplate(titleChunk) {
+        return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
+      }
+    },
+    build: {
+      stats: false
+    }
+  }
+
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(options)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
+})
+
+test.serial('Start browser', async t => {
+  t.plan(0) // suppress 'no assertions' warning
+  await browser.start({
+    // slowMo: 50,
+    // headless: false
+  })
+})
+
+test.serial('Open /', async t => {
+  page = await browser.page(url('/'))
+
+  t.is(await page.$text('h1'), 'Index page')
+})
+
+test.serial('/stateless', async t => {
+  const { hook } = await page.nuxt.navigate('/stateless', false)
+  const loading = await page.nuxt.loadingData()
+
+  t.is(loading.show, true)
+  await hook
+  t.is(await page.$text('h1'), 'My component!')
+})
+
+test.serial('/css', async t => {
+  await page.nuxt.navigate('/css')
+
+  t.is(await page.$text('.red'), 'This is red')
+  t.is(
+    await page.$eval('.red', red => window.getComputedStyle(red).color),
+    'rgb(255, 0, 0)'
+  )
+})
+
+test.serial('/stateful', async t => {
+  await page.nuxt.navigate('/stateful')
+
+  t.is(await page.$text('p'), 'The answer is 42')
+})
+
+test.serial('/store', async t => {
+  await page.nuxt.navigate('/store')
+
+  t.is(await page.$text('h1'), 'Vuex Nested Modules')
+  t.is(await page.$text('p'), '1')
+  t.is(await page.$text('h2'), '4')
+  t.is(await page.$text('h3'), '10')
+})
+
+test.serial('/head', async t => {
+  const msg = new Promise(resolve =>
+    page.on('console', msg => resolve(msg.text()))
+  )
+  await page.nuxt.navigate('/head')
+  const metas = await page.$$attr('meta', 'content')
+
+  t.is(await msg, 'Body script!')
+  t.is(await page.title(), 'My title - Nuxt.js')
+  t.is(await page.$text('h1'), 'I can haz meta tags')
+  t.is(metas[0], 'my meta')
+})
+
+test.serial('/async-data', async t => {
+  await page.nuxt.navigate('/async-data')
+
+  t.is(await page.$text('p'), 'Nuxt.js')
+})
+
+test.serial('/await-async-data', async t => {
+  await page.nuxt.navigate('/await-async-data')
+
+  t.is(await page.$text('p'), 'Await Nuxt.js')
+})
+
+test.serial('/callback-async-data', async t => {
+  await page.nuxt.navigate('/callback-async-data')
+
+  t.is(await page.$text('p'), 'Callback Nuxt.js')
+})
+
+test.serial('/users/1', async t => {
+  await page.nuxt.navigate('/users/1')
+
+  t.is(await page.$text('h1'), 'User: 1')
+})
+
+test.serial('/validate should display a 404', async t => {
+  await page.nuxt.navigate('/validate')
+  const error = await page.nuxt.errorData()
+
+  t.is(error.statusCode, 404)
+  t.is(error.message, 'This page could not be found')
+})
+
+test.serial('/validate?valid=true', async t => {
+  await page.nuxt.navigate('/validate?valid=true')
+
+  t.is(await page.$text('h1'), 'I am valid')
+})
+
+test.serial('/redirect', async t => {
+  await page.nuxt.navigate('/redirect')
+
+  t.is(await page.$text('h1'), 'Index page')
+})
+
+test.serial('/error', async t => {
+  await page.nuxt.navigate('/error')
+
+  t.deepEqual(await page.nuxt.errorData(), { statusCode: 500 })
+  t.is(await page.$text('.title'), 'Error mouahahah')
+})
+
+test.serial('/error2', async t => {
+  await page.nuxt.navigate('/error2')
+
+  t.is(await page.$text('.title'), 'Custom error')
+  t.deepEqual(await page.nuxt.errorData(), { message: 'Custom error' })
+})
+
+test.serial('/redirect-middleware', async t => {
+  await page.nuxt.navigate('/redirect-middleware')
+
+  t.is(await page.$text('h1'), 'Index page')
+})
+
+test.serial('/redirect-external', async t => {
+  // New page for redirecting to external link.
+  const page = await browser.page(url('/'))
+  await page.nuxt.navigate('/redirect-external', false)
+  await page.waitForFunction(
+    () => window.location.href === 'https://nuxtjs.org/'
+  )
+  page.close()
+  t.pass()
+})
+
+test.serial('/redirect-name', async t => {
+  await page.nuxt.navigate('/redirect-name')
+
+  t.is(await page.$text('h1'), 'My component!')
+})
+
+test.serial('/no-ssr', async t => {
+  await page.nuxt.navigate('/no-ssr')
+
+  t.is(await page.$text('h1'), 'Displayed only on client-side')
+})
+
+test.serial('/meta', async t => {
+  await page.nuxt.navigate('/meta')
+
+  const state = await page.nuxt.storeState()
+  t.deepEqual(state.meta, [{ works: true }])
+})
+
+test.serial('/fn-midd', async t => {
+  await page.nuxt.navigate('/fn-midd')
+
+  t.is(await page.$text('.title'), 'You need to ask the permission')
+  t.deepEqual(await page.nuxt.errorData(), {
+    message: 'You need to ask the permission',
+    statusCode: 403
+  })
+})
+
+test.serial('/fn-midd?please=true', async t => {
+  await page.nuxt.navigate('/fn-midd?please=true')
+
+  const h1 = await page.$text('h1')
+  t.true(h1.includes('Date:'))
+})
+
+test.serial('/router-guard', async t => {
+  await page.nuxt.navigate('/router-guard')
+
+  const p = await page.$text('p')
+  t.is(p, 'Nuxt.js')
+})
+
+test.after.always('Stop browser', async () => {
+  process.on('unhandledRejection', () => {})
+  await browser.stop()
+})
+
+// Close server and ask nuxt to stop listening to file changes
+test.after.always('Closing server and nuxt.js', async () => {
+  await nuxt.close()
+})
diff --git a/test/fixtures/basic/pages/store.vue b/test/fixtures/basic/pages/store.vue
index 32fbf8750a..d9d834cd51 100644
--- a/test/fixtures/basic/pages/store.vue
+++ b/test/fixtures/basic/pages/store.vue
@@ -3,6 +3,10 @@
     <h1>{{ baz }}</h1>
     <br>
     <p>{{ $store.state.counter }}</p>
+    <br>
+    <h2>{{ getVal }}</h2>
+    <br>
+    <h3>{{ getBabVal }}</h3>
   </div>
 </template>
 
@@ -10,6 +14,10 @@
 import { mapGetters } from 'vuex'
 
 export default {
-  computed: mapGetters('foo/bar', ['baz'])
+  computed: {
+    ...mapGetters('foo/bar', ['baz']),
+    ...mapGetters('foo/blarg', ['getVal']),
+    ...mapGetters('bab', ['getBabVal'])
+  }
 }
 </script>
diff --git a/test/fixtures/basic/store/bab/index.js b/test/fixtures/basic/store/bab/index.js
new file mode 100644
index 0000000000..babbad5bf2
--- /dev/null
+++ b/test/fixtures/basic/store/bab/index.js
@@ -0,0 +1,9 @@
+export const state = () => ({
+  babVal: 10
+})
+
+export const getters = {
+  getBabVal(state) {
+    return state.babVal
+  }
+}
diff --git a/test/fixtures/basic/store/foo/blarg.js b/test/fixtures/basic/store/foo/blarg.js
new file mode 100644
index 0000000000..e156a53018
--- /dev/null
+++ b/test/fixtures/basic/store/foo/blarg.js
@@ -0,0 +1,9 @@
+export const state = () => ({
+  val: 1
+})
+
+export const getters = {
+  getVal(state) {
+    return 100
+  }
+}
diff --git a/test/fixtures/basic/store/foo/blarg/getters.js b/test/fixtures/basic/store/foo/blarg/getters.js
new file mode 100644
index 0000000000..34a4b4236a
--- /dev/null
+++ b/test/fixtures/basic/store/foo/blarg/getters.js
@@ -0,0 +1,5 @@
+export default {
+  getVal(state) {
+    return state.val
+  }
+}
diff --git a/test/fixtures/basic/store/foo/blarg/index.js b/test/fixtures/basic/store/foo/blarg/index.js
new file mode 100644
index 0000000000..1777a87beb
--- /dev/null
+++ b/test/fixtures/basic/store/foo/blarg/index.js
@@ -0,0 +1,9 @@
+export const state = () => ({
+  val: 2
+})
+
+export const getters = {
+  getVal(state) {
+    return 99
+  }
+}
diff --git a/test/fixtures/basic/store/foo/blarg/state.js b/test/fixtures/basic/store/foo/blarg/state.js
new file mode 100644
index 0000000000..b5a088b8e3
--- /dev/null
+++ b/test/fixtures/basic/store/foo/blarg/state.js
@@ -0,0 +1,3 @@
+export default () => ({
+  val: 4
+})