diff --git a/src/app.js b/src/app.js
index 8fc71c39bf..3cd14888df 100644
--- a/src/app.js
+++ b/src/app.js
@@ -7,9 +7,9 @@ var SetupStore = require('./stores/SetupStore');
 var bugsnag = require('bugsnag-js');
 var ipc = require('ipc');
 var machine = require('./utils/DockerMachineUtil');
-var metrics = require('./util/MetricsUtil');
+var metrics = require('./utils/MetricsUtil');
 var router = require('./router');
-var template = require('./MenuTemplate');
+var template = require('./menutemplate');
 var webUtil = require('./utils/WebUtil');
 
 webUtil.addWindowSizeSaving();
diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js
index 00c274567f..36e5fa25d3 100644
--- a/src/components/ContainerDetailsSubheader.react.js
+++ b/src/components/ContainerDetailsSubheader.react.js
@@ -3,7 +3,7 @@ var $ = require('jquery');
 var React = require('react');
 var exec = require('exec');
 var path =  require('path');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var ContainerStore = require('../stores/ContainerStore');
 var ContainerUtil = require('../utils/ContainerUtil');
 var machine = require('../utils/DockerMachineUtil');
diff --git a/src/components/ContainerHomeFolders.react.js b/src/components/ContainerHomeFolders.react.js
index 3ab4fe57f3..ce44d828a1 100644
--- a/src/components/ContainerHomeFolders.react.js
+++ b/src/components/ContainerHomeFolders.react.js
@@ -4,7 +4,7 @@ var RetinaImage = require('react-retina-image');
 var path = require('path');
 var shell = require('shell');
 var util = require('../utils/Util');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var ContainerStore = require('../stores/ContainerStore');
 
 var ContainerHomeFolder = React.createClass({
diff --git a/src/components/ContainerHomeLogs.react.js b/src/components/ContainerHomeLogs.react.js
index fd292f5bbc..40d3fede58 100644
--- a/src/components/ContainerHomeLogs.react.js
+++ b/src/components/ContainerHomeLogs.react.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
 var React = require('react/addons');
 var LogStore = require('../stores/LogStore');
 var Router = require('react-router');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 
 var _prevBottom = 0;
 
diff --git a/src/components/ContainerHomePreview.react.js b/src/components/ContainerHomePreview.react.js
index 097b89ba23..f32df1a1ce 100644
--- a/src/components/ContainerHomePreview.react.js
+++ b/src/components/ContainerHomePreview.react.js
@@ -4,7 +4,7 @@ var exec = require('exec');
 var ContainerStore = require('../stores/ContainerStore');
 var ContainerUtil = require('../utils/ContainerUtil');
 var request = require('request');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var webPorts = require('../utils/Util').webPorts;
 
 var ContainerHomePreview = React.createClass({
diff --git a/src/components/ContainerListItem.react.js b/src/components/ContainerListItem.react.js
index 5bc8167c88..801f577111 100644
--- a/src/components/ContainerListItem.react.js
+++ b/src/components/ContainerListItem.react.js
@@ -3,7 +3,7 @@ var React = require('react/addons');
 var Router = require('react-router');
 var remote = require('remote');
 var dialog = remote.require('dialog');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var ContainerStore = require('../stores/ContainerStore');
 var OverlayTrigger = require('react-bootstrap').OverlayTrigger;
 var Tooltip = require('react-bootstrap').Tooltip;
diff --git a/src/components/ContainerListNewItem.react.js b/src/components/ContainerListNewItem.react.js
index 1bb4c080e7..d26c98ef32 100644
--- a/src/components/ContainerListNewItem.react.js
+++ b/src/components/ContainerListNewItem.react.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
 var React = require('react/addons');
 var Router = require('react-router');
 var ContainerStore = require('../stores/ContainerStore');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 
 var ContainerListNewItem = React.createClass({
   handleItemMouseEnter: function () {
diff --git a/src/components/ContainerSettingsGeneral.react.js b/src/components/ContainerSettingsGeneral.react.js
index 38fb47b3ec..4fad44b149 100644
--- a/src/components/ContainerSettingsGeneral.react.js
+++ b/src/components/ContainerSettingsGeneral.react.js
@@ -5,7 +5,7 @@ var path =  require('path');
 var remote = require('remote');
 var rimraf = require('rimraf');
 var fs = require('fs');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var dialog = remote.require('dialog');
 var ContainerStore = require('../stores/ContainerStore');
 var ContainerUtil = require('../utils/ContainerUtil');
diff --git a/src/components/ContainerSettingsPorts.react.js b/src/components/ContainerSettingsPorts.react.js
index fbd84ef420..b60499d76a 100644
--- a/src/components/ContainerSettingsPorts.react.js
+++ b/src/components/ContainerSettingsPorts.react.js
@@ -3,7 +3,7 @@ var React = require('react/addons');
 var exec = require('exec');
 var ContainerStore = require('../stores/ContainerStore');
 var ContainerUtil = require('../utils/ContainerUtil');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var webPorts = require('../utils/Util').webPorts;
 
 var ContainerSettingsPorts = React.createClass({
diff --git a/src/components/ContainerSettingsVolumes.react.js b/src/components/ContainerSettingsVolumes.react.js
index 97ab6864f3..6bd9fb7294 100644
--- a/src/components/ContainerSettingsVolumes.react.js
+++ b/src/components/ContainerSettingsVolumes.react.js
@@ -3,7 +3,7 @@ var React = require('react/addons');
 var remote = require('remote');
 var exec = require('exec');
 var dialog = remote.require('dialog');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var ContainerStore = require('../stores/ContainerStore');
 
 var ContainerSettingsVolumes = React.createClass({
diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js
index 04ce28c333..2836dc89ed 100644
--- a/src/components/Containers.react.js
+++ b/src/components/Containers.react.js
@@ -6,7 +6,7 @@ var ContainerList = require('./ContainerList.react');
 var Header = require('./Header.react');
 var ipc = require('ipc');
 var remote = require('remote');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var autoUpdater = remote.require('auto-updater');
 var RetinaImage = require('react-retina-image');
 var machine = require('../utils/DockerMachineUtil');
diff --git a/src/components/ImageCard.react.js b/src/components/ImageCard.react.js
index 2e8efdb54a..cecc2c77e5 100644
--- a/src/components/ImageCard.react.js
+++ b/src/components/ImageCard.react.js
@@ -2,7 +2,7 @@ var $ = require('jquery');
 var React = require('react/addons');
 var RetinaImage = require('react-retina-image');
 var ContainerStore = require('../stores/ContainerStore');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var OverlayTrigger = require('react-bootstrap').OverlayTrigger;
 var Tooltip = require('react-bootstrap').Tooltip;
 var util = require('../utils/Util');
diff --git a/src/components/NewContainer.react.js b/src/components/NewContainer.react.js
index 490edd3b06..cc6d7520c1 100644
--- a/src/components/NewContainer.react.js
+++ b/src/components/NewContainer.react.js
@@ -5,7 +5,7 @@ var RetinaImage = require('react-retina-image');
 var Radial = require('./Radial.react');
 var ImageCard = require('./ImageCard.react');
 var Promise = require('bluebird');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var classNames = require('classnames');
 
 var _recommended = [];
diff --git a/src/components/Preferences.react.js b/src/components/Preferences.react.js
index 09b7af2bf1..fc96ce7dff 100644
--- a/src/components/Preferences.react.js
+++ b/src/components/Preferences.react.js
@@ -1,5 +1,5 @@
 var React = require('react/addons');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var Router = require('react-router');
 
 var Preferences = React.createClass({
diff --git a/src/components/Setup.react.js b/src/components/Setup.react.js
index 73e6b932b7..9b699f8402 100644
--- a/src/components/Setup.react.js
+++ b/src/components/Setup.react.js
@@ -5,7 +5,7 @@ var SetupStore = require('../stores/SetupStore');
 var RetinaImage = require('react-retina-image');
 var Header = require('./Header.react');
 var Util = require('../utils/Util');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 
 var Setup = React.createClass({
   mixins: [ Router.Navigation ],
diff --git a/src/menu.js b/src/menutemplate.js
similarity index 98%
rename from src/menu.js
rename to src/menutemplate.js
index 7c381715db..b291336c03 100644
--- a/src/menu.js
+++ b/src/menutemplate.js
@@ -2,7 +2,7 @@ var remote = require('remote');
 var app = remote.require('app');
 var router = require('./router');
 var util = require('./utils/Util');
-var metrics = require('./util/MetricsUtil');
+var metrics = require('./utils/MetricsUtil');
 var machine = require('./utils/DockerMachineUtil');
 var docker = require('./utils/DockerUtil');
 
diff --git a/src/stores/ContainerStore.js b/src/stores/ContainerStore.js
index dc8d341c5a..81715a5a16 100644
--- a/src/stores/ContainerStore.js
+++ b/src/stores/ContainerStore.js
@@ -2,8 +2,8 @@ var _ = require('underscore');
 var EventEmitter = require('events').EventEmitter;
 var async = require('async');
 var assign = require('object-assign');
-var docker = require('../util/DockerUtil');
-var metrics = require('../util/MetricsUtil');
+var docker = require('../utils/DockerUtil');
+var metrics = require('../utils/MetricsUtil');
 var registry = require('../utils/RegistryUtil');
 var logstore = require('../stores/LogStore');
 var bugsnag = require('bugsnag-js');
diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js
index adf1f0b364..6bdb76033a 100644
--- a/src/stores/SetupStore.js
+++ b/src/stores/SetupStore.js
@@ -8,7 +8,7 @@ var virtualBox = require('../utils/VirtualBoxUtil');
 var setupUtil = require('../utils/SetupUtil');
 var util = require('../utils/Util');
 var assign = require('object-assign');
-var metrics = require('../util/MetricsUtil');
+var metrics = require('../utils/MetricsUtil');
 var bugsnag = require('bugsnag-js');
 var docker = require('../utils/DockerUtil');
 
diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js
index 682ec46c45..3447f0f577 100644
--- a/src/utils/MetricsUtil.js
+++ b/src/utils/MetricsUtil.js
@@ -3,7 +3,7 @@ var Mixpanel = require('mixpanel');
 var uuid = require('node-uuid');
 var fs = require('fs');
 var path = require('path');
-var util = require('./utils/Util');
+var util = require('./Util');
 var settings;
 
 try {