diff --git a/src/backends/backend.js b/src/backends/backend.js
index d588aea6..43e00126 100644
--- a/src/backends/backend.js
+++ b/src/backends/backend.js
@@ -103,7 +103,7 @@ class Backend {
   }
 
   persistEntry(config, collection, entryDraft, MediaFiles) {
-    const mode = this.getPublishMode(config);
+
     const newEntry = entryDraft.getIn(['entry', 'newRecord']) || false;
     const entryData = entryDraft.getIn(['entry', 'data']).toJS();
     let entryObj;
@@ -126,7 +126,11 @@ class Backend {
           collection.get('label') + ' “' +
           entryDraft.getIn(['entry', 'data', 'title']) + '”';
 
-    return this.implementation.persistEntry(entryObj, MediaFiles, { newEntry, commitMessage, mode });
+    const mode = this.getPublishMode(config);
+
+    const collectionName = collection.get('name');
+
+    return this.implementation.persistEntry(entryObj, MediaFiles, { newEntry, commitMessage, collectionName, mode });
   }
 
   entryToRaw(collection, entry) {
diff --git a/src/backends/github/API.js b/src/backends/github/API.js
new file mode 100644
index 00000000..4e26684d
--- /dev/null
+++ b/src/backends/github/API.js
@@ -0,0 +1,228 @@
+import LocalForage from 'localforage';
+import MediaProxy from '../../valueObjects/MediaProxy';
+import { Base64 } from 'js-base64';
+import { BRANCH } from '../constants';
+
+const API_ROOT = 'https://api.github.com';
+
+export default class API {
+  constructor(token, repo, branch) {
+    this.token = token;
+    this.repo = repo;
+    this.branch = branch;
+    this.repoURL = `/repos/${this.repo}`;
+    this.checkMetadataBranch();
+  }
+
+  user() {
+    return this.request('/user');
+  }
+
+  requestHeaders(headers = {}) {
+    return {
+      Authorization: `token ${this.token}`,
+      'Content-Type': 'application/json',
+      ...headers
+    };
+  }
+
+  parseJsonResponse(response) {
+    return response.json().then((json) => {
+      if (!response.ok) {
+        return Promise.reject(json);
+      }
+
+      return json;
+    });
+  }
+
+  request(path, options = {}) {
+    const headers = this.requestHeaders(options.headers || {});
+    return fetch(API_ROOT + path, { ...options, headers: headers }).then((response) => {
+      if (response.headers.get('Content-Type').match(/json/)) {
+        return this.parseJsonResponse(response);
+      }
+
+      return response.text();
+    });
+  }
+
+  checkMetadataBranch() {
+    this.request(`${this.repoURL}/contents?ref=_netlify_cms`, {
+      cache: false
+    })
+    .then(result => console.log(result))
+    .catch(error => {
+      //Branch doesn't exist
+      const readme = {
+        raw: '# Netlify CMS\n\nThis branch is used by the Netlify CMS to store metadata information for specific files and branches.'
+      };
+
+      this.uploadBlob(readme)
+      .then(item => this.request(`${this.repoURL}/git/trees`, {
+        method: 'POST',
+        body: JSON.stringify({ tree: [{ path: 'README.md', mode: '100644', type: 'blob', sha: item.sha }] })
+      }))
+      .then(tree => this.request(`${this.repoURL}/git/commits`, {
+        method: 'POST',
+        body: JSON.stringify({ message: 'First Commit', tree: tree.sha, parents: [] })
+      }))
+      .then(response => this.createBranch('_netlify_cms', response.sha));
+    });
+
+    // List all branches inside /cms
+    // this.request(`${this.repoURL}/git/refs/heads/cms/`).then((result) => {
+    //   console.log(result);
+    // });
+
+  }
+
+  readFile(path, sha) {
+    const cache = sha ? LocalForage.getItem(`gh.${sha}`) : Promise.resolve(null);
+    return cache.then((cached) => {
+      if (cached) { return cached; }
+
+      return this.request(`${this.repoURL}/contents/${path}`, {
+        headers: { Accept: 'application/vnd.github.VERSION.raw' },
+        body: { ref: this.branch },
+        cache: false
+      }).then((result) => {
+        if (sha) {
+          LocalForage.setItem(`gh.${sha}`, result);
+        }
+
+        return result;
+      });
+    });
+  }
+
+  listFiles(path) {
+    return this.request(`${this.repoURL}/contents/${path}`, {
+      body: { ref: this.branch }
+    });
+  }
+
+  persistFiles(entry, mediaFiles, options) {
+    let filename, part, parts, subtree;
+    const fileTree = {};
+    const files = [];
+    mediaFiles.concat(entry).forEach((file) => {
+      if (file.uploaded) { return; }
+      files.push(this.uploadBlob(file));
+      parts = file.path.split('/').filter((part) => part);
+      filename = parts.pop();
+      subtree = fileTree;
+      while (part = parts.shift()) {
+        subtree[part] = subtree[part] || {};
+        subtree = subtree[part];
+      }
+      subtree[filename] = file;
+      file.file = true;
+    });
+
+    return Promise.all(files)
+      .then(() => this.getBranch())
+      .then((branchData) => {
+        return this.updateTree(branchData.commit.sha, '/', fileTree);
+      })
+      .then((changeTree) => {
+        return this.request(`${this.repoURL}/git/commits`, {
+          method: 'POST',
+          body: JSON.stringify({ message: options.commitMessage, tree: changeTree.sha, parents: [changeTree.parentSha] })
+        });
+      }).then((response) => {
+        if (options.mode && options.mode === BRANCH) {
+          const newBranch = options.collectionName ? `cms/${options.collectionName}-${entry.slug}` : `cms/${entry.slug}`;
+          return this.createBranch(newBranch, response.sha);
+        } else {
+          return this.patchBranch(this.branch, response.sha);
+        }
+      });
+  }
+
+  getBranch() {
+    return this.request(`${this.repoURL}/branches/${this.branch}`);
+  }
+
+  createBranch(branchName, sha) {
+    return this.request(`${this.repoURL}/git/refs`, {
+      method: 'POST',
+      body: JSON.stringify({ ref: `refs/heads/${branchName}`, sha }),
+    });
+  }
+
+  patchBranch(branchName, sha) {
+    return this.request(`${this.repoURL}/git/refs/heads/${branchName}`, {
+      method: 'PATCH',
+      body: JSON.stringify({ sha })
+    });
+  }
+
+  getTree(sha) {
+    return sha ? this.request(`${this.repoURL}/git/trees/${sha}`) : Promise.resolve({ tree: [] });
+  }
+
+  toBase64(str) {
+    return Promise.resolve(
+      Base64.encode(str)
+    );
+  }
+
+  uploadBlob(item) {
+    const content = item instanceof MediaProxy ? item.toBase64() : this.toBase64(item.raw);
+
+    return content.then((contentBase64) => {
+      return this.request(`${this.repoURL}/git/blobs`, {
+        method: 'POST',
+        body: JSON.stringify({
+          content: contentBase64,
+          encoding: 'base64'
+        })
+      }).then((response) => {
+        item.sha = response.sha;
+        item.uploaded = true;
+        return item;
+      });
+    });
+  }
+
+  updateTree(sha, path, fileTree) {
+    return this.getTree(sha)
+      .then((tree) => {
+        var obj, filename, fileOrDir;
+        var updates = [];
+        var added = {};
+
+        for (var i = 0, len = tree.tree.length; i < len; i++) {
+          obj = tree.tree[i];
+          if (fileOrDir = fileTree[obj.path]) {
+            added[obj.path] = true;
+            if (fileOrDir.file) {
+              updates.push({ path: obj.path, mode: obj.mode, type: obj.type, sha: fileOrDir.sha });
+            } else {
+              updates.push(this.updateTree(obj.sha, obj.path, fileOrDir));
+            }
+          }
+        }
+        for (filename in fileTree) {
+          fileOrDir = fileTree[filename];
+          if (added[filename]) { continue; }
+          updates.push(
+            fileOrDir.file ?
+              { path: filename, mode: '100644', type: 'blob', sha: fileOrDir.sha } :
+              this.updateTree(null, filename, fileOrDir)
+          );
+        }
+        return Promise.all(updates)
+          .then((updates) => {
+            return this.request(`${this.repoURL}/git/trees`, {
+              method: 'POST',
+              body: JSON.stringify({ base_tree: sha, tree: updates })
+            });
+          }).then((response) => {
+            return { path: path, mode: '040000', type: 'tree', sha: response.sha, parentSha: sha };
+          });
+      });
+  }
+
+}
diff --git a/src/backends/github/implementation.js b/src/backends/github/implementation.js
index 832cabaf..acabf3fd 100644
--- a/src/backends/github/implementation.js
+++ b/src/backends/github/implementation.js
@@ -1,201 +1,6 @@
-import LocalForage from 'localforage';
-import MediaProxy from '../../valueObjects/MediaProxy';
 import { createEntry } from '../../valueObjects/Entry';
 import AuthenticationPage from './AuthenticationPage';
-import { Base64 } from 'js-base64';
-import { BRANCH } from '../constants';
-
-const API_ROOT = 'https://api.github.com';
-
-class API {
-  constructor(token, repo, branch) {
-    this.token = token;
-    this.repo = repo;
-    this.branch = branch;
-    this.repoURL = `/repos/${this.repo}`;
-  }
-
-  user() {
-    return this.request('/user');
-  }
-
-  readFile(path, sha) {
-    const cache = sha ? LocalForage.getItem(`gh.${sha}`) : Promise.resolve(null);
-    return cache.then((cached) => {
-      if (cached) { return cached; }
-
-      return this.request(`${this.repoURL}/contents/${path}`, {
-        headers: { Accept: 'application/vnd.github.VERSION.raw' },
-        body: { ref: this.branch },
-        cache: false
-      }).then((result) => {
-        if (sha) {
-          LocalForage.setItem(`gh.${sha}`, result);
-        }
-
-        return result;
-      });
-    });
-  }
-
-  listFiles(path) {
-    return this.request(`${this.repoURL}/contents/${path}`, {
-      body: { ref: this.branch }
-    });
-  }
-
-  persistFiles(entry, mediaFiles, options) {
-    let filename, part, parts, subtree;
-    const fileTree = {};
-    const files = [];
-    mediaFiles.concat(entry).forEach((file) => {
-      if (file.uploaded) { return; }
-      files.push(this.uploadBlob(file));
-      parts = file.path.split('/').filter((part) => part);
-      filename = parts.pop();
-      subtree = fileTree;
-      while (part = parts.shift()) {
-        subtree[part] = subtree[part] || {};
-        subtree = subtree[part];
-      }
-      subtree[filename] = file;
-      file.file = true;
-    });
-
-    return Promise.all(files)
-      .then(() => this.getBranch())
-      .then((branchData) => {
-        return this.updateTree(branchData.commit.sha, '/', fileTree);
-      })
-      .then((changeTree) => {
-        return this.request(`${this.repoURL}/git/commits`, {
-          method: 'POST',
-          body: JSON.stringify({ message: options.commitMessage, tree: changeTree.sha, parents: [changeTree.parentSha] })
-        });
-      }).then((response) => {
-        if (options.mode === BRANCH) {
-          return this.createBranch(`cms/${entry.slug}`, response.sha);
-        } else {
-          return this.patchBranch(this.branch, response.sha);
-        }
-      });
-  }
-
-  requestHeaders(headers = {}) {
-    return {
-      Authorization: `token ${this.token}`,
-      'Content-Type': 'application/json',
-      ...headers
-    };
-  }
-
-  parseJsonResponse(response) {
-    return response.json().then((json) => {
-      if (!response.ok) {
-        return Promise.reject(json);
-      }
-
-      return json;
-    });
-  }
-
-  request(path, options = {}) {
-    const headers = this.requestHeaders(options.headers || {});
-    return fetch(API_ROOT + path, { ...options, headers: headers }).then((response) => {
-      if (response.headers.get('Content-Type').match(/json/)) {
-        return this.parseJsonResponse(response);
-      }
-
-      return response.text();
-    });
-  }
-
-  getBranch() {
-    return this.request(`${this.repoURL}/branches/${this.branch}`);
-  }
-
-  createBranch(branchName, sha) {
-    return this.request(`${this.repoURL}/git/refs`, {
-      method: 'POST',
-      body: JSON.stringify({ ref: `refs/heads/${branchName}`, sha }),
-    });
-  }
-
-  patchBranch(branchName, sha) {
-    return this.request(`${this.repoURL}/git/refs/heads/${branchName}`, {
-      method: 'PATCH',
-      body: JSON.stringify({ sha })
-    });
-  }
-
-  getTree(sha) {
-    return sha ? this.request(`${this.repoURL}/git/trees/${sha}`) : Promise.resolve({ tree: [] });
-  }
-
-  toBase64(str) {
-    return Promise.resolve(
-      Base64.encode(str)
-    );
-  }
-
-  uploadBlob(item) {
-    const content = item instanceof MediaProxy ? item.toBase64() : this.toBase64(item.raw);
-
-    return content.then((contentBase64) => {
-      return this.request(`${this.repoURL}/git/blobs`, {
-        method: 'POST',
-        body: JSON.stringify({
-          content: contentBase64,
-          encoding: 'base64'
-        })
-      }).then((response) => {
-        item.sha = response.sha;
-        item.uploaded = true;
-        return item;
-      });
-    });
-  }
-
-  updateTree(sha, path, fileTree) {
-    return this.getTree(sha)
-      .then((tree) => {
-        var obj, filename, fileOrDir;
-        var updates = [];
-        var added = {};
-
-        for (var i = 0, len = tree.tree.length; i < len; i++) {
-          obj = tree.tree[i];
-          if (fileOrDir = fileTree[obj.path]) {
-            added[obj.path] = true;
-            if (fileOrDir.file) {
-              updates.push({ path: obj.path, mode: obj.mode, type: obj.type, sha: fileOrDir.sha });
-            } else {
-              updates.push(this.updateTree(obj.sha, obj.path, fileOrDir));
-            }
-          }
-        }
-        for (filename in fileTree) {
-          fileOrDir = fileTree[filename];
-          if (added[filename]) { continue; }
-          updates.push(
-            fileOrDir.file ?
-              { path: filename, mode: '100644', type: 'blob', sha: fileOrDir.sha } :
-              this.updateTree(null, filename, fileOrDir)
-          );
-        }
-        return Promise.all(updates)
-          .then((updates) => {
-            return this.request(`${this.repoURL}/git/trees`, {
-              method: 'POST',
-              body: JSON.stringify({ base_tree: sha, tree: updates })
-            });
-          }).then((response) => {
-            return { path: path, mode: '040000', type: 'tree', sha: response.sha, parentSha: sha };
-          });
-      });
-  }
-
-}
+import API from './API';
 
 export default class GitHub {
   constructor(config) {