diff --git a/.gitignore b/.gitignore
index d30f40e..d0f794d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+debug.log
diff --git a/src/components/BuildControls/BuildControls.js b/src/components/BuildControls/BuildControls.js
deleted file mode 100644
index fcede15..0000000
--- a/src/components/BuildControls/BuildControls.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react'
-
-import BuildControl from './BuildControl/BuildControl';
-import classes from './BuildControls.css';
-
-const buildControls = (props) => (
-    <div className={classes.buildControls}>
-        <BuildControl Name="Meat" />
-        <BuildControl Name="Cheese" />
-        <BuildControl Name="Salad" />
-        <BuildControl Name="Bacon" />
-    </div>
-)
-
-export default buildControls;
\ No newline at end of file
diff --git a/src/components/BuildControls/BuildControl/BuildControl.css b/src/components/Burger/BuildControls/BuildControl/BuildControl.css
similarity index 100%
rename from src/components/BuildControls/BuildControl/BuildControl.css
rename to src/components/Burger/BuildControls/BuildControl/BuildControl.css
diff --git a/src/components/BuildControls/BuildControl/BuildControl.js b/src/components/Burger/BuildControls/BuildControl/BuildControl.js
similarity index 100%
rename from src/components/BuildControls/BuildControl/BuildControl.js
rename to src/components/Burger/BuildControls/BuildControl/BuildControl.js
diff --git a/src/components/BuildControls/BuildControls.css b/src/components/Burger/BuildControls/BuildControls.css
similarity index 100%
rename from src/components/BuildControls/BuildControls.css
rename to src/components/Burger/BuildControls/BuildControls.css
diff --git a/src/components/Burger/BuildControls/BuildControls.js b/src/components/Burger/BuildControls/BuildControls.js
new file mode 100644
index 0000000..04c1351
--- /dev/null
+++ b/src/components/Burger/BuildControls/BuildControls.js
@@ -0,0 +1,21 @@
+import React from 'react'
+
+import BuildControl from './BuildControl/BuildControl';
+import classes from './BuildControls.css';
+
+const controls = [
+    { name: 'Salad', type: 'salad'},
+    { name: 'Cheese', type: 'cheese'},
+    { name: 'Bacon', type: 'bacon'},
+    { name: 'Meat', type: 'meat'},
+];
+
+const buildControls = (props) => (
+    <div className={classes.BuildControls}>
+        {controls.map( ctrl => (
+            <BuildControl Key={ctrl.name} Name={ctrl.name} />
+        ))}
+    </div>
+)
+
+export default buildControls;
\ No newline at end of file
diff --git a/src/containers/BurgerBuilder/BurgerBuilder.js b/src/containers/BurgerBuilder/BurgerBuilder.js
index 3df3c93..d618045 100644
--- a/src/containers/BurgerBuilder/BurgerBuilder.js
+++ b/src/containers/BurgerBuilder/BurgerBuilder.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 import Aux from '../../hoc/Auxiliary';
 import Burger from '../../components/Burger/Burger';
-import BuildControls from '../../components/BuildControls/BuildControls';
+import BuildControls from '../../components/Burger/BuildControls/BuildControls';
 
 class BurgerBuilder extends Component {