diff --git a/bower.json b/bower.json
index 31df5bb..de54a3c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "isotope",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "Filter and sort magical layouts",
   "main": [
     "js/item.js",
@@ -8,8 +8,7 @@
     "js/isotope.js",
     "js/layout-modes/vertical.js",
     "js/layout-modes/fit-rows.js",
-    "js/layout-modes/masonry.js",
-    "js/layout-modes/cells-by-row.js"
+    "js/layout-modes/masonry.js"
   ],
   "dependencies": {
     "get-size": "desandro/get-size",
@@ -19,6 +18,11 @@
   },
   "devDependencies": {
     "doc-ready": "desandro/doc-ready",
+    "isotope-cells-by-column": "metafizzy/isotope-cells-by-column",
+    "isotope-cells-by-row": "metafizzy/isotope-cells-by-row",
+    "isotope-fit-columns": "metafizzy/isotope-fit-columns",
+    "isotope-horizontal": "metafizzy/isotope-horizontal",
+    "isotope-masonry-horizontal": "metafizzy/isotope-masonry-horizontal",
     "jquery": "1",
     "qunit": "1.12"
   }
diff --git a/examples/cells-by-row.html b/examples/cells-by-row.html
index e6b1b54..4a24b84 100644
--- a/examples/cells-by-row.html
+++ b/examples/cells-by-row.html
@@ -159,9 +159,10 @@
 <script src="../js/layout-mode.js"></script>
 <script src="../js/isotope.js"></script>
 <script src="../js/layout-modes/fit-rows.js"></script>
-<script src="../js/layout-modes/cells-by-row.js"></script>
 <script src="../js/layout-modes/vertical.js"></script>
 
+<script src="../bower_components/isotope-cells-by-row/cells-by-row.js"></script>
+
 <script>
 docReady( function() {
   var container = document.querySelector('#container');
diff --git a/examples/filter-sort.html b/examples/filter-sort.html
index 1bec6a4..f02e04f 100644
--- a/examples/filter-sort.html
+++ b/examples/filter-sort.html
@@ -155,9 +155,10 @@
 <script src="../js/layout-mode.js"></script>
 <script src="../js/isotope.js"></script>
 <script src="../js/layout-modes/fit-rows.js"></script>
-<script src="../js/layout-modes/cells-by-row.js"></script>
 <script src="../js/layout-modes/vertical.js"></script>
 
+<script src="../bower_components/isotope-cells-by-row/cells-by-row.js"></script>
+
 <script>
 docReady( function() {
   var container = document.querySelector('#container');
diff --git a/examples/horizontal-layout-modes.html b/examples/horizontal-layout-modes.html
index 28fa195..0143687 100644
--- a/examples/horizontal-layout-modes.html
+++ b/examples/horizontal-layout-modes.html
@@ -160,9 +160,10 @@
 <script src="../js/item.js"></script>
 <script src="../js/layout-mode.js"></script>
 <script src="../js/isotope.js"></script>
-<script src="../js/layout-modes/fit-columns.js"></script>
-<script src="../js/layout-modes/horizontal.js"></script>
-<script src="../js/layout-modes/cells-by-column.js"></script>
+
+<script src="../bower_components/isotope-fit-columns/fit-columns.js"></script>
+<script src="../bower_components/isotope-cells-by-column/cells-by-column.js"></script>
+<script src="../bower_components/isotope-horizontal/horizontal.js"></script>
 
 <script>
 docReady( function() {
diff --git a/examples/masonry-horizontal.html b/examples/masonry-horizontal.html
index 5ba1341..4fc0d0c 100644
--- a/examples/masonry-horizontal.html
+++ b/examples/masonry-horizontal.html
@@ -189,10 +189,11 @@
 <script src="../js/item.js"></script>
 <script src="../js/layout-mode.js"></script>
 <script src="../js/isotope.js"></script>
-<script src="../js/layout-modes/fit-columns.js"></script>
-<script src="../js/layout-modes/horizontal.js"></script>
-<script src="../js/layout-modes/cells-by-column.js"></script>
-<script src="../js/layout-modes/masonry-horizontal.js"></script>
+
+<script src="../bower_components/isotope-fit-columns/fit-columns.js"></script>
+<script src="../bower_components/isotope-cells-by-column/cells-by-column.js"></script>
+<script src="../bower_components/isotope-horizontal/horizontal.js"></script>
+<script src="../bower_components/isotope-masonry-horizontal/masonry-horizontal.js"></script>
 
 <script>
 docReady( function() {
diff --git a/js/isotope.js b/js/isotope.js
index f609fb4..8583c83 100644
--- a/js/isotope.js
+++ b/js/isotope.js
@@ -1,5 +1,5 @@
 /*!
- * Isotope v2.0.0-beta.6
+ * Isotope v2.0.0-beta.7
  * Magical sorting and filtering layouts
  * http://isotope.metafizzy.co
  */
diff --git a/js/layout-modes/cells-by-column.js b/js/layout-modes/cells-by-column.js
deleted file mode 100644
index 2cf34c9..0000000
--- a/js/layout-modes/cells-by-column.js
+++ /dev/null
@@ -1,61 +0,0 @@
-( function( window ) {
-
-'use strict';
-
-function cellsByColumnDefinition( LayoutMode ) {
-
-  var CellsByColumn = LayoutMode.create( 'cellsByColumn' );
-
-  CellsByColumn.prototype._resetLayout = function() {
-    // reset properties
-    this.itemIndex = 0;
-    // measurements
-    this.getColumnWidth();
-    this.getRowHeight();
-    // set rows
-    this.rows = Math.floor( this.isotope.size.innerHeight / this.rowHeight );
-    this.rows = Math.max( this.rows, 1 );
-  };
-
-  CellsByColumn.prototype._getItemLayoutPosition = function( item ) {
-    item.getSize();
-    var col = Math.floor( this.itemIndex / this.rows );
-    var row = this.itemIndex % this.rows;
-    // center item within cell
-    var x = ( col + 0.5 ) * this.columnWidth - item.size.outerWidth / 2;
-    var y = ( row + 0.5 ) * this.rowHeight - item.size.outerHeight / 2;
-    this.itemIndex++;
-    return { x: x, y: y };
-  };
-
-  CellsByColumn.prototype._getContainerSize = function() {
-    return {
-      width: Math.ceil( this.itemIndex / this.rows ) * this.columnWidth
-    };
-  };
-
-  CellsByColumn.prototype.resize = function() {
-    this.resizeVertical();
-  };
-
-  return CellsByColumn;
-
-}
-
-if ( typeof define === 'function' && define.amd ) {
-  // AMD
-  define( [
-      '../layout-mode'
-    ],
-    cellsByColumnDefinition );
-} else {
-  // browser global
-  cellsByColumnDefinition(
-    window.Isotope.LayoutMode
-  );
-}
-
-
-})( window );
-
-
diff --git a/js/layout-modes/cells-by-row.js b/js/layout-modes/cells-by-row.js
deleted file mode 100644
index eb2d9e6..0000000
--- a/js/layout-modes/cells-by-row.js
+++ /dev/null
@@ -1,59 +0,0 @@
-( function( window ) {
-
-'use strict';
-
-function cellsByRowDefinition( LayoutMode ) {
-
-  var CellsByRow = LayoutMode.create( 'cellsByRow' );
-
-  CellsByRow.prototype._resetLayout = function() {
-    // reset properties
-    this.itemIndex = 0;
-    // measurements
-    this.getColumnWidth();
-    this.getRowHeight();
-    // set cols
-    this.cols = Math.floor( this.isotope.size.innerWidth / this.columnWidth );
-    this.cols = Math.max( this.cols, 1 );
-  };
-
-  CellsByRow.prototype._getItemLayoutPosition = function( item ) {
-    item.getSize();
-    var col = this.itemIndex % this.cols;
-    var row = Math.floor( this.itemIndex / this.cols );
-    // center item within cell
-    var x = ( col + 0.5 ) * this.columnWidth - item.size.outerWidth / 2;
-    var y = ( row + 0.5 ) * this.rowHeight - item.size.outerHeight / 2;
-    this.itemIndex++;
-    return { x: x, y: y };
-  };
-
-  CellsByRow.prototype._getContainerSize = function() {
-    return {
-      height: Math.ceil( this.itemIndex / this.cols ) * this.rowHeight
-    };
-  };
-
-  return CellsByRow;
-
-}
-
-if ( typeof define === 'function' && define.amd ) {
-  // AMD
-  define( [
-      '../layout-mode',
-      'get-size/get-size'
-    ],
-    cellsByRowDefinition );
-} else {
-  // browser global
-  cellsByRowDefinition(
-    window.Isotope.LayoutMode,
-    window.getSize
-  );
-}
-
-
-})( window );
-
-
diff --git a/js/layout-modes/fit-columns.js b/js/layout-modes/fit-columns.js
deleted file mode 100644
index 2460db8..0000000
--- a/js/layout-modes/fit-columns.js
+++ /dev/null
@@ -1,60 +0,0 @@
-( function( window ) {
-
-'use strict';
-
-function fitColumnsDefinition( LayoutMode ) {
-
-  var FitColumns = LayoutMode.create('fitColumns');
-
-  FitColumns.prototype._resetLayout = function() {
-    this.x = 0;
-    this.y = 0;
-    this.maxX = 0;
-  };
-
-  FitColumns.prototype._getItemLayoutPosition = function( item ) {
-    item.getSize();
-
-    // if this element cannot fit in the current row
-    if ( this.y !== 0 && item.size.outerHeight + this.y > this.isotope.size.innerHeight ) {
-      this.y = 0;
-      this.x = this.maxX;
-    }
-
-    var position = {
-      x: this.x,
-      y: this.y
-    };
-
-    this.maxX = Math.max( this.maxX, this.x + item.size.outerWidth );
-    this.y += item.size.outerHeight;
-
-    return position;
-  };
-
-  FitColumns.prototype._getContainerSize = function() {
-    return { width: this.maxX };
-  };
-
-  FitColumns.prototype.resize = function() {
-    this.resizeVertical();
-  };
-
-  return FitColumns;
-
-}
-
-if ( typeof define === 'function' && define.amd ) {
-  // AMD
-  define( [
-      '../layout-mode'
-    ],
-    fitColumnsDefinition );
-} else {
-  // browser global
-  fitColumnsDefinition(
-    window.Isotope.LayoutMode
-  );
-}
-
-})( window );
diff --git a/js/layout-modes/horizontal.js b/js/layout-modes/horizontal.js
deleted file mode 100644
index 1833933..0000000
--- a/js/layout-modes/horizontal.js
+++ /dev/null
@@ -1,49 +0,0 @@
-( function( window ) {
-
-'use strict';
-
-function horizontalDefinition( LayoutMode ) {
-
-  var Horizontal = LayoutMode.create( 'horizontal', {
-    verticalAlignment: 0
-  });
-
-  Horizontal.prototype._resetLayout = function() {
-    this.x = 0;
-  };
-
-  Horizontal.prototype._getItemLayoutPosition = function( item ) {
-    item.getSize();
-    var y = ( this.isotope.size.innerHeight - item.size.outerHeight ) *
-      this.options.verticalAlignment;
-    var x = this.x;
-    this.x += item.size.outerWidth;
-    return { x: x, y: y };
-  };
-
-  Horizontal.prototype._getContainerSize = function() {
-    return { width: this.x };
-  };
-
-  Horizontal.prototype.resize = function() {
-    this.resizeVertical();
-  };
-
-  return Horizontal;
-
-}
-
-if ( typeof define === 'function' && define.amd ) {
-  // AMD
-  define( [
-      '../layout-mode'
-    ],
-    horizontalDefinition );
-} else {
-  // browser global
-  horizontalDefinition(
-    window.Isotope.LayoutMode
-  );
-}
-
-})( window );
diff --git a/js/layout-modes/masonry-horizontal.js b/js/layout-modes/masonry-horizontal.js
deleted file mode 100644
index 9644d78..0000000
--- a/js/layout-modes/masonry-horizontal.js
+++ /dev/null
@@ -1,145 +0,0 @@
-( function( window ) {
-
-'use strict';
-
-// -------------------------- helpers -------------------------- //
-
-var indexOf = Array.prototype.indexOf ?
-  function( items, value ) {
-    return items.indexOf( value );
-  } :
-  function ( items, value ) {
-    for ( var i=0, len = items.length; i < len; i++ ) {
-      var item = items[i];
-      if ( item === value ) {
-        return i;
-      }
-    }
-    return -1;
-  };
-
-// -------------------------- definition -------------------------- //
-
-function masonryHorizontalDefinition( getSize, LayoutMode ) {
-  // create an Outlayer layout class
-  var MasonryHorizontal = LayoutMode.create('masonryHorizontal');
-
-  MasonryHorizontal.prototype._resetLayout = function() {
-    this.getRowHeight();
-    this._getMeasurement( 'gutter', 'outerHeight' );
-
-    this.rowHeight += this.gutter;
-    // measure rows
-    this.rows = Math.floor( ( this.isotope.size.innerHeight + this.gutter ) / this.rowHeight );
-    this.rows = Math.max( this.rows, 1 );
-
-    // reset row Xs
-    var i = this.rows;
-    this.rowXs = [];
-    while (i--) {
-      this.rowXs.push( 0 );
-    }
-
-    this.maxX = 0;
-  };
-
-  MasonryHorizontal.prototype._getItemLayoutPosition = function( item ) {
-    item.getSize();
-    // how many rows does this brick span
-    var rowSpan = Math.ceil( item.size.outerHeight / this.rowHeight );
-    rowSpan = Math.min( rowSpan, this.rows );
-
-    var rowGroup = this._getRowGroup( rowSpan );
-    // get the minimum Y value from the rows
-    var minimumX = Math.min.apply( Math, rowGroup );
-    var shortRowIndex = indexOf( rowGroup, minimumX );
-
-    // position the brick
-    var position = {
-      x: minimumX,
-      y: this.rowHeight * shortRowIndex
-    };
-
-    // apply setHeight to necessary rows
-    var setWidth = minimumX + item.size.outerWidth;
-    var setSpan = this.rows + 1 - rowGroup.length;
-    for ( var i = 0; i < setSpan; i++ ) {
-      this.rowXs[ shortRowIndex + i ] = setWidth;
-    }
-
-    return position;
-  };
-
-  /**
-   * @param {Number} rowSpan - number of rows the element spans
-   * @returns {Array} rowGroup
-   */
-  MasonryHorizontal.prototype._getRowGroup = function( rowSpan ) {
-    if ( rowSpan < 2 ) {
-      // if brick spans only one row, use all the row Xs
-      return this.rowXs;
-    }
-
-    var rowGroup = [];
-    // how many different places could this brick fit horizontally
-    var groupCount = this.rows + 1 - rowSpan;
-    // for each group potential horizontal position
-    for ( var i = 0; i < groupCount; i++ ) {
-      // make an array of rowX values for that one group
-      var groupRowXs = this.rowXs.slice( i, i + rowSpan );
-      // and get the max value of the array
-      rowGroup[i] = Math.max.apply( Math, groupRowXs );
-    }
-    return rowGroup;
-  };
-
-  MasonryHorizontal.prototype._manageStamp = function( stamp ) {
-    var stampSize = getSize( stamp );
-    var offset = this.isotope._getElementOffset( stamp );
-    // get the rows that this stamp affects
-    var firstY = this.isotope.options.isOriginTop ? offset.top : offset.bottom;
-    var lastY = firstY + stampSize.outerHeight;
-    var firstRow = Math.floor( firstY / this.rowHeight );
-    firstRow = Math.max( 0, firstRow );
-    var lastRow = Math.floor( lastY / this.rowHeight );
-    lastRow = Math.min( this.rows - 1, lastRow );
-    // set rowXs to outside edge of the stamp
-    var stampMaxX = ( this.isotope.options.isOriginLeft ? offset.left : offset.right ) +
-      stampSize.outerWidth;
-    for ( var i = firstRow; i <= lastRow; i++ ) {
-      this.rowXs[i] = Math.max( stampMaxX, this.rowXs[i] );
-    }
-  };
-
-  MasonryHorizontal.prototype._getContainerSize = function() {
-    this.maxX = Math.max.apply( Math, this.rowXs );
-
-    return {
-      width: this.maxX
-    };
-  };
-
-  MasonryHorizontal.prototype.resize = function() {
-    this.resizeVertical();
-  };
-
-  return MasonryHorizontal;
-
-}
-
-if ( typeof define === 'function' && define.amd ) {
-  // AMD
-  define( [
-      'get-size/get-size',
-      '../layout-mode'
-    ],
-    masonryHorizontalDefinition );
-} else {
-  // browser global
-  masonryHorizontalDefinition(
-    window.getSize,
-    window.Isotope.LayoutMode
-  );
-}
-
-})( window );