diff --git a/grunt/tasks/version-check.js b/grunt/tasks/version-check.js
index 476eeff15b..ae082988ad 100644
--- a/grunt/tasks/version-check.js
+++ b/grunt/tasks/version-check.js
@@ -10,7 +10,7 @@ var reactVersionExp = /\bReact\.version\s*=\s*['"]([^'"]+)['"];/;
 
 module.exports = function() {
   var reactVersion = reactVersionExp.exec(
-    grunt.file.read('./src/core/React.js')
+    grunt.file.read('./src/browser/React.js')
   )[1];
   var npmReactVersion = grunt.file.readJSON('./npm-react/package.json').version;
   var reactToolsVersion = grunt.config.data.pkg.version;
diff --git a/src/core/ReactComponentWithPureRenderMixin.js b/src/addons/ReactComponentWithPureRenderMixin.js
similarity index 100%
rename from src/core/ReactComponentWithPureRenderMixin.js
rename to src/addons/ReactComponentWithPureRenderMixin.js
diff --git a/src/environment/ClientReactRootIndex.js b/src/browser/ClientReactRootIndex.js
similarity index 100%
rename from src/environment/ClientReactRootIndex.js
rename to src/browser/ClientReactRootIndex.js
diff --git a/src/core/React.js b/src/browser/React.js
similarity index 100%
rename from src/core/React.js
rename to src/browser/React.js
diff --git a/src/core/ReactComponentBrowserEnvironment.js b/src/browser/ReactComponentBrowserEnvironment.js
similarity index 100%
rename from src/core/ReactComponentBrowserEnvironment.js
rename to src/browser/ReactComponentBrowserEnvironment.js
diff --git a/src/core/ReactDOM.js b/src/browser/ReactDOM.js
similarity index 100%
rename from src/core/ReactDOM.js
rename to src/browser/ReactDOM.js
diff --git a/src/core/ReactDOMComponent.js b/src/browser/ReactDOMComponent.js
similarity index 100%
rename from src/core/ReactDOMComponent.js
rename to src/browser/ReactDOMComponent.js
diff --git a/src/core/ReactDOMIDOperations.js b/src/browser/ReactDOMIDOperations.js
similarity index 100%
rename from src/core/ReactDOMIDOperations.js
rename to src/browser/ReactDOMIDOperations.js
diff --git a/src/core/ReactDOMSelection.js b/src/browser/ReactDOMSelection.js
similarity index 100%
rename from src/core/ReactDOMSelection.js
rename to src/browser/ReactDOMSelection.js
diff --git a/src/core/ReactDefaultInjection.js b/src/browser/ReactDefaultInjection.js
similarity index 100%
rename from src/core/ReactDefaultInjection.js
rename to src/browser/ReactDefaultInjection.js
diff --git a/src/core/ReactEventEmitter.js b/src/browser/ReactEventEmitter.js
similarity index 100%
rename from src/core/ReactEventEmitter.js
rename to src/browser/ReactEventEmitter.js
diff --git a/src/core/ReactEventTopLevelCallback.js b/src/browser/ReactEventTopLevelCallback.js
similarity index 100%
rename from src/core/ReactEventTopLevelCallback.js
rename to src/browser/ReactEventTopLevelCallback.js
diff --git a/src/core/ReactInputSelection.js b/src/browser/ReactInputSelection.js
similarity index 100%
rename from src/core/ReactInputSelection.js
rename to src/browser/ReactInputSelection.js
diff --git a/src/core/ReactMount.js b/src/browser/ReactMount.js
similarity index 100%
rename from src/core/ReactMount.js
rename to src/browser/ReactMount.js
diff --git a/src/core/ReactPutListenerQueue.js b/src/browser/ReactPutListenerQueue.js
similarity index 100%
rename from src/core/ReactPutListenerQueue.js
rename to src/browser/ReactPutListenerQueue.js
diff --git a/src/core/ReactReconcileTransaction.js b/src/browser/ReactReconcileTransaction.js
similarity index 100%
rename from src/core/ReactReconcileTransaction.js
rename to src/browser/ReactReconcileTransaction.js
diff --git a/src/core/ReactTextComponent.js b/src/browser/ReactTextComponent.js
similarity index 100%
rename from src/core/ReactTextComponent.js
rename to src/browser/ReactTextComponent.js
diff --git a/src/ReactWithAddons.js b/src/browser/ReactWithAddons.js
similarity index 100%
rename from src/ReactWithAddons.js
rename to src/browser/ReactWithAddons.js
diff --git a/src/core/__tests__/ReactDOMIDOperations-test.js b/src/browser/__tests__/ReactDOMIDOperations-test.js
similarity index 100%
rename from src/core/__tests__/ReactDOMIDOperations-test.js
rename to src/browser/__tests__/ReactDOMIDOperations-test.js
diff --git a/src/core/__tests__/ReactEventEmitter-test.js b/src/browser/__tests__/ReactEventEmitter-test.js
similarity index 100%
rename from src/core/__tests__/ReactEventEmitter-test.js
rename to src/browser/__tests__/ReactEventEmitter-test.js
diff --git a/src/core/__tests__/ReactEventTopLevelCallback-test.js b/src/browser/__tests__/ReactEventTopLevelCallback-test.js
similarity index 100%
rename from src/core/__tests__/ReactEventTopLevelCallback-test.js
rename to src/browser/__tests__/ReactEventTopLevelCallback-test.js
diff --git a/src/core/__tests__/ReactMount-test.js b/src/browser/__tests__/ReactMount-test.js
similarity index 100%
rename from src/core/__tests__/ReactMount-test.js
rename to src/browser/__tests__/ReactMount-test.js
diff --git a/src/core/__tests__/ReactMountDestruction-test.js b/src/browser/__tests__/ReactMountDestruction-test.js
similarity index 100%
rename from src/core/__tests__/ReactMountDestruction-test.js
rename to src/browser/__tests__/ReactMountDestruction-test.js
diff --git a/src/core/__tests__/ReactRenderDocument-test.js b/src/browser/__tests__/ReactRenderDocument-test.js
similarity index 100%
rename from src/core/__tests__/ReactRenderDocument-test.js
rename to src/browser/__tests__/ReactRenderDocument-test.js
diff --git a/src/environment/__tests__/ReactWebWorker-test.js b/src/browser/__tests__/ReactWebWorker-test.js
similarity index 100%
rename from src/environment/__tests__/ReactWebWorker-test.js
rename to src/browser/__tests__/ReactWebWorker-test.js
diff --git a/src/dom/CSSProperty.js b/src/browser/dom/CSSProperty.js
similarity index 100%
rename from src/dom/CSSProperty.js
rename to src/browser/dom/CSSProperty.js
diff --git a/src/dom/CSSPropertyOperations.js b/src/browser/dom/CSSPropertyOperations.js
similarity index 100%
rename from src/dom/CSSPropertyOperations.js
rename to src/browser/dom/CSSPropertyOperations.js
diff --git a/src/dom/DOMChildrenOperations.js b/src/browser/dom/DOMChildrenOperations.js
similarity index 100%
rename from src/dom/DOMChildrenOperations.js
rename to src/browser/dom/DOMChildrenOperations.js
diff --git a/src/dom/DOMProperty.js b/src/browser/dom/DOMProperty.js
similarity index 100%
rename from src/dom/DOMProperty.js
rename to src/browser/dom/DOMProperty.js
diff --git a/src/dom/DOMPropertyOperations.js b/src/browser/dom/DOMPropertyOperations.js
similarity index 100%
rename from src/dom/DOMPropertyOperations.js
rename to src/browser/dom/DOMPropertyOperations.js
diff --git a/src/dom/Danger.js b/src/browser/dom/Danger.js
similarity index 100%
rename from src/dom/Danger.js
rename to src/browser/dom/Danger.js
diff --git a/src/dom/DefaultDOMPropertyConfig.js b/src/browser/dom/DefaultDOMPropertyConfig.js
similarity index 100%
rename from src/dom/DefaultDOMPropertyConfig.js
rename to src/browser/dom/DefaultDOMPropertyConfig.js
diff --git a/src/dom/ViewportMetrics.js b/src/browser/dom/ViewportMetrics.js
similarity index 100%
rename from src/dom/ViewportMetrics.js
rename to src/browser/dom/ViewportMetrics.js
diff --git a/src/dom/__tests__/CSSPropertyOperations-test.js b/src/browser/dom/__tests__/CSSPropertyOperations-test.js
similarity index 100%
rename from src/dom/__tests__/CSSPropertyOperations-test.js
rename to src/browser/dom/__tests__/CSSPropertyOperations-test.js
diff --git a/src/dom/__tests__/DOMPropertyOperations-test.js b/src/browser/dom/__tests__/DOMPropertyOperations-test.js
similarity index 100%
rename from src/dom/__tests__/DOMPropertyOperations-test.js
rename to src/browser/dom/__tests__/DOMPropertyOperations-test.js
diff --git a/src/dom/__tests__/Danger-test.js b/src/browser/dom/__tests__/Danger-test.js
similarity index 99%
rename from src/dom/__tests__/Danger-test.js
rename to src/browser/dom/__tests__/Danger-test.js
index 5086a8f279..f82a97241e 100644
--- a/src/dom/__tests__/Danger-test.js
+++ b/src/browser/dom/__tests__/Danger-test.js
@@ -16,9 +16,8 @@
  * @jsx React.DOM
  * @emails react-core
  */
-/*jslint evil: true */
 
-"use strict";
+/*jslint evil: true */
 
 var React = require('React');
 
diff --git a/src/dom/__tests__/getNodeForCharacterOffset-test.js b/src/browser/dom/__tests__/getNodeForCharacterOffset-test.js
similarity index 100%
rename from src/dom/__tests__/getNodeForCharacterOffset-test.js
rename to src/browser/dom/__tests__/getNodeForCharacterOffset-test.js
diff --git a/src/dom/components/AutoFocusMixin.js b/src/browser/dom/components/AutoFocusMixin.js
similarity index 100%
rename from src/dom/components/AutoFocusMixin.js
rename to src/browser/dom/components/AutoFocusMixin.js
diff --git a/src/dom/components/LinkedValueUtils.js b/src/browser/dom/components/LinkedValueUtils.js
similarity index 100%
rename from src/dom/components/LinkedValueUtils.js
rename to src/browser/dom/components/LinkedValueUtils.js
diff --git a/src/dom/components/ReactDOMButton.js b/src/browser/dom/components/ReactDOMButton.js
similarity index 100%
rename from src/dom/components/ReactDOMButton.js
rename to src/browser/dom/components/ReactDOMButton.js
diff --git a/src/dom/components/ReactDOMForm.js b/src/browser/dom/components/ReactDOMForm.js
similarity index 100%
rename from src/dom/components/ReactDOMForm.js
rename to src/browser/dom/components/ReactDOMForm.js
diff --git a/src/dom/components/ReactDOMImg.js b/src/browser/dom/components/ReactDOMImg.js
similarity index 100%
rename from src/dom/components/ReactDOMImg.js
rename to src/browser/dom/components/ReactDOMImg.js
diff --git a/src/dom/components/ReactDOMInput.js b/src/browser/dom/components/ReactDOMInput.js
similarity index 100%
rename from src/dom/components/ReactDOMInput.js
rename to src/browser/dom/components/ReactDOMInput.js
diff --git a/src/dom/components/ReactDOMOption.js b/src/browser/dom/components/ReactDOMOption.js
similarity index 100%
rename from src/dom/components/ReactDOMOption.js
rename to src/browser/dom/components/ReactDOMOption.js
diff --git a/src/dom/components/ReactDOMSelect.js b/src/browser/dom/components/ReactDOMSelect.js
similarity index 100%
rename from src/dom/components/ReactDOMSelect.js
rename to src/browser/dom/components/ReactDOMSelect.js
diff --git a/src/dom/components/ReactDOMTextarea.js b/src/browser/dom/components/ReactDOMTextarea.js
similarity index 100%
rename from src/dom/components/ReactDOMTextarea.js
rename to src/browser/dom/components/ReactDOMTextarea.js
diff --git a/src/dom/components/__tests__/ReactDOMButton-test.js b/src/browser/dom/components/__tests__/ReactDOMButton-test.js
similarity index 100%
rename from src/dom/components/__tests__/ReactDOMButton-test.js
rename to src/browser/dom/components/__tests__/ReactDOMButton-test.js
diff --git a/src/dom/components/__tests__/ReactDOMInput-test.js b/src/browser/dom/components/__tests__/ReactDOMInput-test.js
similarity index 100%
rename from src/dom/components/__tests__/ReactDOMInput-test.js
rename to src/browser/dom/components/__tests__/ReactDOMInput-test.js
diff --git a/src/dom/components/__tests__/ReactDOMSelect-test.js b/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
similarity index 100%
rename from src/dom/components/__tests__/ReactDOMSelect-test.js
rename to src/browser/dom/components/__tests__/ReactDOMSelect-test.js
diff --git a/src/dom/components/__tests__/ReactDOMTextarea-test.js b/src/browser/dom/components/__tests__/ReactDOMTextarea-test.js
similarity index 100%
rename from src/dom/components/__tests__/ReactDOMTextarea-test.js
rename to src/browser/dom/components/__tests__/ReactDOMTextarea-test.js
diff --git a/src/dom/components/createFullPageComponent.js b/src/browser/dom/components/createFullPageComponent.js
similarity index 100%
rename from src/dom/components/createFullPageComponent.js
rename to src/browser/dom/components/createFullPageComponent.js
diff --git a/src/dom/dangerousStyleValue.js b/src/browser/dom/dangerousStyleValue.js
similarity index 100%
rename from src/dom/dangerousStyleValue.js
rename to src/browser/dom/dangerousStyleValue.js
diff --git a/src/dom/filterAttributes.js b/src/browser/dom/filterAttributes.js
similarity index 100%
rename from src/dom/filterAttributes.js
rename to src/browser/dom/filterAttributes.js
diff --git a/src/dom/getEventKey.js b/src/browser/dom/getEventKey.js
similarity index 100%
rename from src/dom/getEventKey.js
rename to src/browser/dom/getEventKey.js
diff --git a/src/dom/getEventTarget.js b/src/browser/dom/getEventTarget.js
similarity index 100%
rename from src/dom/getEventTarget.js
rename to src/browser/dom/getEventTarget.js
diff --git a/src/dom/getNodeForCharacterOffset.js b/src/browser/dom/getNodeForCharacterOffset.js
similarity index 100%
rename from src/dom/getNodeForCharacterOffset.js
rename to src/browser/dom/getNodeForCharacterOffset.js
diff --git a/src/dom/getTextContentAccessor.js b/src/browser/dom/getTextContentAccessor.js
similarity index 100%
rename from src/dom/getTextContentAccessor.js
rename to src/browser/dom/getTextContentAccessor.js
diff --git a/src/dom/isEventSupported.js b/src/browser/dom/isEventSupported.js
similarity index 100%
rename from src/dom/isEventSupported.js
rename to src/browser/dom/isEventSupported.js
diff --git a/src/eventPlugins/AnalyticsEventPluginFactory.js b/src/browser/eventPlugins/AnalyticsEventPluginFactory.js
similarity index 100%
rename from src/eventPlugins/AnalyticsEventPluginFactory.js
rename to src/browser/eventPlugins/AnalyticsEventPluginFactory.js
diff --git a/src/eventPlugins/ChangeEventPlugin.js b/src/browser/eventPlugins/ChangeEventPlugin.js
similarity index 100%
rename from src/eventPlugins/ChangeEventPlugin.js
rename to src/browser/eventPlugins/ChangeEventPlugin.js
diff --git a/src/eventPlugins/CompositionEventPlugin.js b/src/browser/eventPlugins/CompositionEventPlugin.js
similarity index 100%
rename from src/eventPlugins/CompositionEventPlugin.js
rename to src/browser/eventPlugins/CompositionEventPlugin.js
diff --git a/src/eventPlugins/DefaultEventPluginOrder.js b/src/browser/eventPlugins/DefaultEventPluginOrder.js
similarity index 100%
rename from src/eventPlugins/DefaultEventPluginOrder.js
rename to src/browser/eventPlugins/DefaultEventPluginOrder.js
diff --git a/src/eventPlugins/EnterLeaveEventPlugin.js b/src/browser/eventPlugins/EnterLeaveEventPlugin.js
similarity index 100%
rename from src/eventPlugins/EnterLeaveEventPlugin.js
rename to src/browser/eventPlugins/EnterLeaveEventPlugin.js
diff --git a/src/eventPlugins/MobileSafariClickEventPlugin.js b/src/browser/eventPlugins/MobileSafariClickEventPlugin.js
similarity index 100%
rename from src/eventPlugins/MobileSafariClickEventPlugin.js
rename to src/browser/eventPlugins/MobileSafariClickEventPlugin.js
diff --git a/src/eventPlugins/ResponderEventPlugin.js b/src/browser/eventPlugins/ResponderEventPlugin.js
similarity index 100%
rename from src/eventPlugins/ResponderEventPlugin.js
rename to src/browser/eventPlugins/ResponderEventPlugin.js
diff --git a/src/eventPlugins/SelectEventPlugin.js b/src/browser/eventPlugins/SelectEventPlugin.js
similarity index 100%
rename from src/eventPlugins/SelectEventPlugin.js
rename to src/browser/eventPlugins/SelectEventPlugin.js
diff --git a/src/eventPlugins/SimpleEventPlugin.js b/src/browser/eventPlugins/SimpleEventPlugin.js
similarity index 100%
rename from src/eventPlugins/SimpleEventPlugin.js
rename to src/browser/eventPlugins/SimpleEventPlugin.js
diff --git a/src/eventPlugins/TapEventPlugin.js b/src/browser/eventPlugins/TapEventPlugin.js
similarity index 100%
rename from src/eventPlugins/TapEventPlugin.js
rename to src/browser/eventPlugins/TapEventPlugin.js
diff --git a/src/eventPlugins/__tests__/AnalyticsEventPlugin-test.js b/src/browser/eventPlugins/__tests__/AnalyticsEventPlugin-test.js
similarity index 100%
rename from src/eventPlugins/__tests__/AnalyticsEventPlugin-test.js
rename to src/browser/eventPlugins/__tests__/AnalyticsEventPlugin-test.js
diff --git a/src/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/browser/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
similarity index 100%
rename from src/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
rename to src/browser/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
diff --git a/src/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/browser/eventPlugins/__tests__/ResponderEventPlugin-test.js
similarity index 100%
rename from src/eventPlugins/__tests__/ResponderEventPlugin-test.js
rename to src/browser/eventPlugins/__tests__/ResponderEventPlugin-test.js
diff --git a/src/core/getReactRootElementInContainer.js b/src/browser/getReactRootElementInContainer.js
similarity index 100%
rename from src/core/getReactRootElementInContainer.js
rename to src/browser/getReactRootElementInContainer.js
diff --git a/src/core/putDOMComponentListener.js b/src/browser/putDOMComponentListener.js
similarity index 100%
rename from src/core/putDOMComponentListener.js
rename to src/browser/putDOMComponentListener.js
diff --git a/src/environment/ReactMarkupChecksum.js b/src/browser/server/ReactMarkupChecksum.js
similarity index 100%
rename from src/environment/ReactMarkupChecksum.js
rename to src/browser/server/ReactMarkupChecksum.js
diff --git a/src/environment/ReactServerRendering.js b/src/browser/server/ReactServerRendering.js
similarity index 100%
rename from src/environment/ReactServerRendering.js
rename to src/browser/server/ReactServerRendering.js
diff --git a/src/environment/ServerReactRootIndex.js b/src/browser/server/ServerReactRootIndex.js
similarity index 100%
rename from src/environment/ServerReactRootIndex.js
rename to src/browser/server/ServerReactRootIndex.js
diff --git a/src/environment/__tests__/ReactServerRendering-test.js b/src/browser/server/__tests__/ReactServerRendering-test.js
similarity index 100%
rename from src/environment/__tests__/ReactServerRendering-test.js
rename to src/browser/server/__tests__/ReactServerRendering-test.js
diff --git a/src/event/synthetic/SyntheticClipboardEvent.js b/src/browser/syntheticEvents/SyntheticClipboardEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticClipboardEvent.js
rename to src/browser/syntheticEvents/SyntheticClipboardEvent.js
diff --git a/src/event/synthetic/SyntheticCompositionEvent.js b/src/browser/syntheticEvents/SyntheticCompositionEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticCompositionEvent.js
rename to src/browser/syntheticEvents/SyntheticCompositionEvent.js
diff --git a/src/event/synthetic/SyntheticDragEvent.js b/src/browser/syntheticEvents/SyntheticDragEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticDragEvent.js
rename to src/browser/syntheticEvents/SyntheticDragEvent.js
diff --git a/src/event/synthetic/SyntheticEvent.js b/src/browser/syntheticEvents/SyntheticEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticEvent.js
rename to src/browser/syntheticEvents/SyntheticEvent.js
diff --git a/src/event/synthetic/SyntheticFocusEvent.js b/src/browser/syntheticEvents/SyntheticFocusEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticFocusEvent.js
rename to src/browser/syntheticEvents/SyntheticFocusEvent.js
diff --git a/src/event/synthetic/SyntheticKeyboardEvent.js b/src/browser/syntheticEvents/SyntheticKeyboardEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticKeyboardEvent.js
rename to src/browser/syntheticEvents/SyntheticKeyboardEvent.js
diff --git a/src/event/synthetic/SyntheticMouseEvent.js b/src/browser/syntheticEvents/SyntheticMouseEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticMouseEvent.js
rename to src/browser/syntheticEvents/SyntheticMouseEvent.js
diff --git a/src/event/synthetic/SyntheticTouchEvent.js b/src/browser/syntheticEvents/SyntheticTouchEvent.js
similarity index 96%
rename from src/event/synthetic/SyntheticTouchEvent.js
rename to src/browser/syntheticEvents/SyntheticTouchEvent.js
index f21bbaa0f5..3c3348bfbf 100644
--- a/src/event/synthetic/SyntheticTouchEvent.js
+++ b/src/browser/syntheticEvents/SyntheticTouchEvent.js
@@ -23,7 +23,7 @@ var SyntheticUIEvent = require('SyntheticUIEvent');
 
 /**
  * @interface TouchEvent
- * @see http://www.w3.org/TR/touch-events/
+ * @see http://www.w3.org/TR/DOM-Level-3-Events/
  */
 var TouchEventInterface = {
   touches: null,
diff --git a/src/event/synthetic/SyntheticUIEvent.js b/src/browser/syntheticEvents/SyntheticUIEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticUIEvent.js
rename to src/browser/syntheticEvents/SyntheticUIEvent.js
diff --git a/src/event/synthetic/SyntheticWheelEvent.js b/src/browser/syntheticEvents/SyntheticWheelEvent.js
similarity index 100%
rename from src/event/synthetic/SyntheticWheelEvent.js
rename to src/browser/syntheticEvents/SyntheticWheelEvent.js
diff --git a/src/event/synthetic/__tests__/SyntheticEvent-test.js b/src/browser/syntheticEvents/__tests__/SyntheticEvent-test.js
similarity index 100%
rename from src/event/synthetic/__tests__/SyntheticEvent-test.js
rename to src/browser/syntheticEvents/__tests__/SyntheticEvent-test.js
diff --git a/src/event/synthetic/__tests__/SyntheticWheelEvent-test.js b/src/browser/syntheticEvents/__tests__/SyntheticWheelEvent-test.js
similarity index 100%
rename from src/event/synthetic/__tests__/SyntheticWheelEvent-test.js
rename to src/browser/syntheticEvents/__tests__/SyntheticWheelEvent-test.js