diff --git a/.eslintrc.js b/.eslintrc.js
index 949de95b..d89a4c1c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,6 +12,9 @@ module.exports = {
     "es6": true,
     "node": true
   },
+  "settings": {
+    "ecmascript": 6
+  },
   "plugins": [
     "promise",
     "standard",
diff --git a/frontend/src/Metamaps/Views/ExploreMaps.js b/frontend/src/Metamaps/ExploreMaps.js
similarity index 91%
rename from frontend/src/Metamaps/Views/ExploreMaps.js
rename to frontend/src/Metamaps/ExploreMaps.js
index ac546f71..5b78ffdb 100644
--- a/frontend/src/Metamaps/Views/ExploreMaps.js
+++ b/frontend/src/Metamaps/ExploreMaps.js
@@ -1,9 +1,8 @@
 /* global $ */
 
-import Active from '../Active'
-import DataModel from '../DataModel'
-import GlobalUI, { ReactApp } from '../GlobalUI'
-import Loading from '../Loading'
+import DataModel from './DataModel'
+import GlobalUI, { ReactApp } from './GlobalUI'
+import Loading from './Loading'
 
 const ExploreMaps = {
   pending: false,
@@ -124,7 +123,7 @@ const ExploreMaps = {
   onStar: function(map) {
     $.post('/maps/' + map.id + '/star')
     map.set('star_count', map.get('star_count') + 1)
-    if (DataModel.Stars) DataModel.Stars.push({ user_id: Active.Mapper.id, map_id: map.id })
+    if (DataModel.Stars) DataModel.Stars.push({ user_id: ReactApp.currentUser.id, map_id: map.id })
     DataModel.Maps.Starred.add(map)
     GlobalUI.notifyUser('Map is now starred')
     ReactApp.render()
@@ -136,16 +135,16 @@ const ExploreMaps = {
     GlobalUI.notifyUser('You will be notified by email if request accepted')
   },
   onMapFollow: function(map) {
-    const isFollowing = map.isFollowedBy(Active.Mapper)
+    const isFollowing = map.isFollowedBy(ReactApp.currentUser)
     $.post({
       url: `/maps/${map.id}/${isFollowing ? 'un' : ''}follow`
     })
     if (isFollowing) {
       GlobalUI.notifyUser('You are no longer following this map')
-      Active.Mapper.unfollowMap(map.id)
+      ReactApp.currentUser.unfollowMap(map.id)
     } else {
       GlobalUI.notifyUser('You are now following this map')
-      Active.Mapper.followMap(map.id)
+      ReactApp.currentUser.followMap(map.id)
     }
     ReactApp.render()
   }
diff --git a/frontend/src/Metamaps/GlobalUI/ReactApp.js b/frontend/src/Metamaps/GlobalUI/ReactApp.js
index 96f17b28..cb99757f 100644
--- a/frontend/src/Metamaps/GlobalUI/ReactApp.js
+++ b/frontend/src/Metamaps/GlobalUI/ReactApp.js
@@ -8,13 +8,9 @@ import { merge } from 'lodash'
 import { notifyUser } from './index.js'
 import ImportDialog from './ImportDialog'
 import Mapper from '../DataModel/Mapper'
-import { ExploreMaps, ChatView, TopicCard } from '../Views'
-import Filter from '../Filter'
-import JIT from '../JIT'
-import Realtime from '../Realtime'
-import Map, { mapControl } from '../Map'
-import Topic from '../Topic'
-import Visualize from '../Visualize'
+import ExploreMaps from '../ExploreMaps'
+import { mapControl } from '../Map'
+import { topicControl } from '../Topic'
 import makeRoutes from '../../components/makeRoutes'
 let routes
 
diff --git a/frontend/src/Metamaps/Active.js b/frontend/src/Metamaps/Map/Active.js
similarity index 100%
rename from frontend/src/Metamaps/Active.js
rename to frontend/src/Metamaps/Map/Active.js
diff --git a/frontend/src/Metamaps/AutoLayout.js b/frontend/src/Metamaps/Map/AutoLayout.js
similarity index 100%
rename from frontend/src/Metamaps/AutoLayout.js
rename to frontend/src/Metamaps/Map/AutoLayout.js
diff --git a/frontend/src/Metamaps/Cable.js b/frontend/src/Metamaps/Map/Cable.js
similarity index 100%
rename from frontend/src/Metamaps/Cable.js
rename to frontend/src/Metamaps/Map/Cable.js
diff --git a/frontend/src/Metamaps/Control.js b/frontend/src/Metamaps/Map/Control.js
similarity index 100%
rename from frontend/src/Metamaps/Control.js
rename to frontend/src/Metamaps/Map/Control.js
diff --git a/frontend/src/Metamaps/Create.js b/frontend/src/Metamaps/Map/Create.js
similarity index 100%
rename from frontend/src/Metamaps/Create.js
rename to frontend/src/Metamaps/Map/Create.js
diff --git a/frontend/src/Metamaps/Filter.js b/frontend/src/Metamaps/Map/Filter.js
similarity index 100%
rename from frontend/src/Metamaps/Filter.js
rename to frontend/src/Metamaps/Map/Filter.js
diff --git a/frontend/src/Metamaps/Import.js b/frontend/src/Metamaps/Map/Import.js
similarity index 100%
rename from frontend/src/Metamaps/Import.js
rename to frontend/src/Metamaps/Map/Import.js
diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/Map/JIT.js
similarity index 100%
rename from frontend/src/Metamaps/JIT.js
rename to frontend/src/Metamaps/Map/JIT.js
diff --git a/frontend/src/Metamaps/Listeners.js b/frontend/src/Metamaps/Map/Listeners.js
similarity index 100%
rename from frontend/src/Metamaps/Listeners.js
rename to frontend/src/Metamaps/Map/Listeners.js
diff --git a/frontend/src/Metamaps/Mouse.js b/frontend/src/Metamaps/Map/Mouse.js
similarity index 100%
rename from frontend/src/Metamaps/Mouse.js
rename to frontend/src/Metamaps/Map/Mouse.js
diff --git a/frontend/src/Metamaps/Organize.js b/frontend/src/Metamaps/Map/Organize.js
similarity index 100%
rename from frontend/src/Metamaps/Organize.js
rename to frontend/src/Metamaps/Map/Organize.js
diff --git a/frontend/src/Metamaps/PasteInput.js b/frontend/src/Metamaps/Map/PasteInput.js
similarity index 100%
rename from frontend/src/Metamaps/PasteInput.js
rename to frontend/src/Metamaps/Map/PasteInput.js
diff --git a/frontend/src/Metamaps/Realtime/events.js b/frontend/src/Metamaps/Map/Realtime/events.js
similarity index 100%
rename from frontend/src/Metamaps/Realtime/events.js
rename to frontend/src/Metamaps/Map/Realtime/events.js
diff --git a/frontend/src/Metamaps/Realtime/index.js b/frontend/src/Metamaps/Map/Realtime/index.js
similarity index 100%
rename from frontend/src/Metamaps/Realtime/index.js
rename to frontend/src/Metamaps/Map/Realtime/index.js
diff --git a/frontend/src/Metamaps/Realtime/receivable.js b/frontend/src/Metamaps/Map/Realtime/receivable.js
similarity index 100%
rename from frontend/src/Metamaps/Realtime/receivable.js
rename to frontend/src/Metamaps/Map/Realtime/receivable.js
diff --git a/frontend/src/Metamaps/Realtime/sendable.js b/frontend/src/Metamaps/Map/Realtime/sendable.js
similarity index 100%
rename from frontend/src/Metamaps/Realtime/sendable.js
rename to frontend/src/Metamaps/Map/Realtime/sendable.js
diff --git a/frontend/src/Metamaps/Selected.js b/frontend/src/Metamaps/Map/Selected.js
similarity index 100%
rename from frontend/src/Metamaps/Selected.js
rename to frontend/src/Metamaps/Map/Selected.js
diff --git a/frontend/src/Metamaps/Synapse.js b/frontend/src/Metamaps/Map/Synapse.js
similarity index 100%
rename from frontend/src/Metamaps/Synapse.js
rename to frontend/src/Metamaps/Map/Synapse.js
diff --git a/frontend/src/Metamaps/SynapseCard.js b/frontend/src/Metamaps/Map/SynapseCard.js
similarity index 100%
rename from frontend/src/Metamaps/SynapseCard.js
rename to frontend/src/Metamaps/Map/SynapseCard.js
diff --git a/frontend/src/Metamaps/Topic.js b/frontend/src/Metamaps/Map/Topic.js
similarity index 100%
rename from frontend/src/Metamaps/Topic.js
rename to frontend/src/Metamaps/Map/Topic.js
diff --git a/frontend/src/Metamaps/Views/ChatView.js b/frontend/src/Metamaps/Map/Views/ChatView.js
similarity index 100%
rename from frontend/src/Metamaps/Views/ChatView.js
rename to frontend/src/Metamaps/Map/Views/ChatView.js
diff --git a/frontend/src/Metamaps/Views/Room.js b/frontend/src/Metamaps/Map/Views/Room.js
similarity index 100%
rename from frontend/src/Metamaps/Views/Room.js
rename to frontend/src/Metamaps/Map/Views/Room.js
diff --git a/frontend/src/Metamaps/Views/TopicCard.js b/frontend/src/Metamaps/Map/Views/TopicCard.js
similarity index 100%
rename from frontend/src/Metamaps/Views/TopicCard.js
rename to frontend/src/Metamaps/Map/Views/TopicCard.js
diff --git a/frontend/src/Metamaps/Views/VideoView.js b/frontend/src/Metamaps/Map/Views/VideoView.js
similarity index 100%
rename from frontend/src/Metamaps/Views/VideoView.js
rename to frontend/src/Metamaps/Map/Views/VideoView.js
diff --git a/frontend/src/Metamaps/Views/index.js b/frontend/src/Metamaps/Map/Views/index.js
similarity index 66%
rename from frontend/src/Metamaps/Views/index.js
rename to frontend/src/Metamaps/Map/Views/index.js
index b613624c..2ca2215d 100644
--- a/frontend/src/Metamaps/Views/index.js
+++ b/frontend/src/Metamaps/Map/Views/index.js
@@ -1,6 +1,5 @@
 /* global $ */
 
-import ExploreMaps from './ExploreMaps'
 import ChatView from './ChatView'
 import VideoView from './VideoView'
 import Room from './Room'
@@ -10,7 +9,7 @@ import { JUNTO_UPDATED } from '../Realtime/events'
 const Views = {
   init: (serverData) => {
     $(document).on(JUNTO_UPDATED, () => ExploreMaps.render())
-    //ChatView.init([serverData['sounds/MM_sounds.mp3'], serverData['sounds/MM_sounds.ogg']])
+    ChatView.init([serverData['sounds/MM_sounds.mp3'], serverData['sounds/MM_sounds.ogg']])
   },
   ExploreMaps,
   ChatView,
@@ -19,5 +18,5 @@ const Views = {
   TopicCard
 }
 
-export { ExploreMaps, ChatView, VideoView, Room, TopicCard }
+export { ChatView, VideoView, Room, TopicCard }
 export default Views
diff --git a/frontend/src/Metamaps/Visualize.js b/frontend/src/Metamaps/Map/Visualize.js
similarity index 100%
rename from frontend/src/Metamaps/Visualize.js
rename to frontend/src/Metamaps/Map/Visualize.js
diff --git a/frontend/src/Metamaps/index.js b/frontend/src/Metamaps/index.js
index b2366e74..8769071d 100644
--- a/frontend/src/Metamaps/index.js
+++ b/frontend/src/Metamaps/index.js
@@ -1,34 +1,33 @@
 import Account from './Account'
-import Active from './Active'
+import Active from './Map/Active'
 import Admin from './Admin'
-import AutoLayout from './AutoLayout'
-import Cable from './Cable'
-import Control from './Control'
-import Create from './Create'
+import AutoLayout from './Map/AutoLayout'
+import Cable from './Map/Cable'
+import Control from './Map/Control'
+import Create from './Map/Create'
 import DataModel from './DataModel'
 import Debug from './Debug'
-import Filter from './Filter'
+import Filter from './Map/Filter'
 import GlobalUI, {
   ReactApp, Search, CreateMap, ImportDialog
 } from './GlobalUI'
-import Import from './Import'
-import JIT from './JIT'
-import Listeners from './Listeners'
+import Import from './Map/Import'
+import JIT from './Map/JIT'
+import Listeners from './Map/Listeners'
 import Loading from './Loading'
 import Map, { CheatSheet } from './Map'
 import Mapper from './Mapper'
-import Mouse from './Mouse'
-import Organize from './Organize'
-import PasteInput from './PasteInput'
-import Realtime from './Realtime'
-import Selected from './Selected'
+import Mouse from './Map/Mouse'
+import Organize from './Map/Organize'
+import PasteInput from './Map/PasteInput'
+import Realtime from './Map/Realtime'
+import Selected from './Map/Selected'
 import Settings from './Settings'
-import Synapse from './Synapse'
-import SynapseCard from './SynapseCard'
-import Topic from './Topic'
+import Synapse from './Map/Synapse'
+import SynapseCard from './Map/SynapseCard'
+import Topic from './Map/Topic'
 import Util from './Util'
-import Views from './Views'
-import Visualize from './Visualize'
+import Visualize from './Map/Visualize'
 
 const Metamaps = window.Metamaps || {}
 Metamaps.Account = Account