diff --git a/public/js/app.jsx b/public/js/app.jsx
index cd4c378df8..47b5682aaa 100644
--- a/public/js/app.jsx
+++ b/public/js/app.jsx
@@ -1,17 +1,17 @@
-var React   = require('react');
-var TabView  = React.createFactory(require('./components/TabView'));
-var Menu     = React.createFactory(require('./components/Menu'));
-var Unleash  = React.createFactory(require('./components/Unleash'));
-var Strategy = React.createFactory(require('./components/strategy/StrategyComponent'));
+var React                  = require('react');
+var TabView                = React.createFactory(require('./components/TabView'));
+var Menu                   = React.createFactory(require('./components/Menu'));
+var FeatureToggleComponent = React.createFactory(require('./components/feature/FeatureToggleComponent'));
+var StrategyComponent      = React.createFactory(require('./components/strategy/StrategyComponent'));
 
 var tabPanes = [
     {
         name: "Feature Toggles",
-        content: new Unleash({pollInterval: 5000})
+        content: new FeatureToggleComponent({pollInterval: 5000})
     },
     {
         name: "Strategies",
-        content: new Strategy({})
+        content: new StrategyComponent({})
     }
 ];
 
diff --git a/public/js/components/FeatureList.jsx b/public/js/components/feature/FeatureList.jsx
similarity index 100%
rename from public/js/components/FeatureList.jsx
rename to public/js/components/feature/FeatureList.jsx
diff --git a/public/js/components/Unleash.jsx b/public/js/components/feature/FeatureToggleComponent.jsx
similarity index 81%
rename from public/js/components/Unleash.jsx
rename to public/js/components/feature/FeatureToggleComponent.jsx
index acd8a8d5fd..1259cd30f4 100644
--- a/public/js/components/Unleash.jsx
+++ b/public/js/components/feature/FeatureToggleComponent.jsx
@@ -1,10 +1,10 @@
 var React         = require('react');
-var Timer         = require('../utils/Timer');
-var ErrorMessages = require('./ErrorMessages');
+var Timer         = require('../../utils/Timer');
+var ErrorMessages = require('../ErrorMessages');
 var FeatureList   = require('./FeatureList');
-var FeatureStore  = require('../stores/FeatureStore');
+var FeatureStore  = require('../../stores/FeatureStore');
 
-var Unleash = React.createClass({
+var FeatureToggleComponent = React.createClass({
     getInitialState: function() {
         return {
             savedFeatures: [],
@@ -116,18 +116,18 @@ var Unleash = React.createClass({
         return (
             <div>
                 <ErrorMessages
-                errors={this.state.errors}
-                onClearErrors={this.clearErrors} />
+                  errors={this.state.errors}
+                  onClearErrors={this.clearErrors} />
                 <FeatureList
-                unsavedFeatures={this.state.unsavedFeatures}
-                savedFeatures={this.state.savedFeatures}
-                onFeatureChanged={this.updateFeature}
-                onFeatureSubmit={this.createFeature}
-                onFeatureCancel={this.cancelNewFeature}
-                onNewFeature={this.newFeature} />
+                  unsavedFeatures={this.state.unsavedFeatures}
+                  savedFeatures={this.state.savedFeatures}
+                  onFeatureChanged={this.updateFeature}
+                  onFeatureSubmit={this.createFeature}
+                  onFeatureCancel={this.cancelNewFeature}
+                  onNewFeature={this.newFeature} />
             </div>
         );
     }
 });
 
-module.exports = Unleash;
\ No newline at end of file
+module.exports = FeatureToggleComponent;
\ No newline at end of file
diff --git a/public/js/components/SavedFeature.jsx b/public/js/components/feature/SavedFeature.jsx
similarity index 100%
rename from public/js/components/SavedFeature.jsx
rename to public/js/components/feature/SavedFeature.jsx
diff --git a/public/js/components/UnsavedFeature.jsx b/public/js/components/feature/UnsavedFeature.jsx
similarity index 100%
rename from public/js/components/UnsavedFeature.jsx
rename to public/js/components/feature/UnsavedFeature.jsx