diff --git a/lib/components/CodeEditor.js b/browser/components/CodeEditor.js
similarity index 100%
rename from lib/components/CodeEditor.js
rename to browser/components/CodeEditor.js
diff --git a/lib/components/ExternalLink.js b/browser/components/ExternalLink.js
similarity index 100%
rename from lib/components/ExternalLink.js
rename to browser/components/ExternalLink.js
diff --git a/lib/components/FolderMark.js b/browser/components/FolderMark.js
similarity index 100%
rename from lib/components/FolderMark.js
rename to browser/components/FolderMark.js
diff --git a/lib/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
similarity index 100%
rename from lib/components/MarkdownPreview.js
rename to browser/components/MarkdownPreview.js
diff --git a/lib/components/ModeIcon.js b/browser/components/ModeIcon.js
similarity index 100%
rename from lib/components/ModeIcon.js
rename to browser/components/ModeIcon.js
diff --git a/lib/components/ModeSelect.js b/browser/components/ModeSelect.js
similarity index 100%
rename from lib/components/ModeSelect.js
rename to browser/components/ModeSelect.js
diff --git a/lib/components/ProfileImage.js b/browser/components/ProfileImage.js
similarity index 100%
rename from lib/components/ProfileImage.js
rename to browser/components/ProfileImage.js
diff --git a/lib/components/TagLink.js b/browser/components/TagLink.js
similarity index 100%
rename from lib/components/TagLink.js
rename to browser/components/TagLink.js
diff --git a/lib/components/TagSelect.js b/browser/components/TagSelect.js
similarity index 100%
rename from lib/components/TagSelect.js
rename to browser/components/TagSelect.js
diff --git a/lib/activityRecord.js b/browser/lib/activityRecord.js
similarity index 100%
rename from lib/activityRecord.js
rename to browser/lib/activityRecord.js
diff --git a/lib/api.js b/browser/lib/api.js
similarity index 93%
rename from lib/api.js
rename to browser/lib/api.js
index 729f1456..fe27ae3e 100644
--- a/lib/api.js
+++ b/browser/lib/api.js
@@ -1,6 +1,5 @@
 import superagent from 'superagent'
 import superagentPromise from 'superagent-promise'
-// import auth from 'boost/auth'
 
 export const SERVER_URL = 'https://b00st.io/'
 // export const SERVER_URL = 'http://localhost:3333/'
diff --git a/lib/clientKey.js b/browser/lib/clientKey.js
similarity index 100%
rename from lib/clientKey.js
rename to browser/lib/clientKey.js
diff --git a/lib/dataStore.js b/browser/lib/dataStore.js
similarity index 100%
rename from lib/dataStore.js
rename to browser/lib/dataStore.js
diff --git a/lib/keygen.js b/browser/lib/keygen.js
similarity index 100%
rename from lib/keygen.js
rename to browser/lib/keygen.js
diff --git a/lib/linkState.js b/browser/lib/linkState.js
similarity index 100%
rename from lib/linkState.js
rename to browser/lib/linkState.js
diff --git a/lib/markdown.js b/browser/lib/markdown.js
similarity index 100%
rename from lib/markdown.js
rename to browser/lib/markdown.js
diff --git a/lib/modal.js b/browser/lib/modal.js
similarity index 100%
rename from lib/modal.js
rename to browser/lib/modal.js
diff --git a/lib/vars/modes.js b/browser/lib/modes.js
similarity index 100%
rename from lib/vars/modes.js
rename to browser/lib/modes.js
diff --git a/lib/openExternal.js b/browser/lib/openExternal.js
similarity index 100%
rename from lib/openExternal.js
rename to browser/lib/openExternal.js
diff --git a/lib/search.js b/browser/lib/search.js
similarity index 100%
rename from lib/search.js
rename to browser/lib/search.js
diff --git a/browser/main/LoginPage.js b/browser/main/LoginPage.js
deleted file mode 100644
index fc01825a..00000000
--- a/browser/main/LoginPage.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { PropTypes } from 'react'
-import { Link } from 'react-router'
-import linkState from 'boost/linkState'
-import { login } from 'boost/api'
-import auth from 'boost/auth'
-
-export default class LoginPage extends React.Component {
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      user: {},
-      isSending: false,
-      error: null
-    }
-    this.linkState = linkState
-  }
-
-  handleSubmit (e) {
-    e.preventDefault()
-    this.setState({
-      isSending: true,
-      error: null
-    }, function () {
-      login(this.state.user)
-        .then(res => {
-          let { user, token } = res.body
-          auth.user(user, token)
-
-          this.props.history.pushState('home')
-        })
-        .catch(err => {
-          console.error(err)
-          if (err.code === 'ECONNREFUSED') {
-            return this.setState({
-              error: {
-                name: 'CunnectionRefused',
-                message: 'Can\'t cznnect to API server.'
-              },
-              isSending: false
-            })
-          } else if (err.status != null) {
-            return this.setState({
-              error: {
-                name: err.response.body.name,
-                message: err.response.body.message
-              },
-              isSending: false
-            })
-          }
-          else throw err
-        })
-    })
-  }
-
-  render () {
-    return (
-      <div className='LoginContainer'>
-        <img className='logo' src='../../resources/favicon-230x230.png'/>
-
-        <nav className='authNavigator text-center'>
-          <Link to='/login' activeClassName='active'>Log In</Link> / <Link to='/signup' activeClassName='active'>Sign Up</Link>
-        </nav>
-
-        <form onSubmit={e => this.handleSubmit(e)}>
-          <div className='formField'>
-            <input valueLink={this.linkState('user.email')} type='text' placeholder='E-mail'/>
-          </div>
-          <div className='formField'>
-            <input valueLink={this.linkState('user.password')} onChange={this.handleChange} type='password' placeholder='Password'/>
-          </div>
-
-          {this.state.isSending
-            ? (
-              <p className='alertInfo'>Logging in...</p>
-            ) : null}
-
-          {this.state.error != null ? <p className='alertError'>{this.state.error.message}</p> : null}
-
-          <div className='formField'>
-            <button className='logInButton' type='submit'>Log In</button>
-          </div>
-        </form>
-      </div>
-    )
-  }
-}
-
-LoginPage.propTypes = {
-  history: PropTypes.shape({
-    pushState: PropTypes.func
-  })
-}
diff --git a/browser/main/SignupPage.js b/browser/main/SignupPage.js
deleted file mode 100644
index 5665b3ad..00000000
--- a/browser/main/SignupPage.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { PropTypes } from 'react'
-import { Link } from 'react-router'
-import linkState from 'boost/linkState'
-import openExternal from 'boost/openExternal'
-import { signup } from 'boost/api'
-import auth from 'boost/auth'
-
-export default class SignupContainer extends React.Component {
-  constructor (props) {
-    super(props)
-    this.state = {
-      user: {},
-      connectionFailed: false,
-      emailConflicted: false,
-      nameConflicted: false,
-      validationFailed: false,
-      isSending: false,
-      error: null
-    }
-    this.linkState = linkState
-    this.openExternal = openExternal
-  }
-
-  handleSubmit (e) {
-    this.setState({
-      isSending: true,
-      error: null
-    }, function () {
-      signup(this.state.user)
-        .then(res => {
-          let { user, token } = res.body
-          auth.user(user, token)
-
-          this.props.history.pushState('home')
-        })
-        .catch(err => {
-          console.error(err)
-          if (err.code === 'ECONNREFUSED') {
-            return this.setState({
-              error: {
-                name: 'CunnectionRefused',
-                message: 'Can\'t connect to API server.'
-              },
-              isSending: false
-            })
-          } else if (err.status != null) {
-            return this.setState({
-              error: {
-                name: err.response.body.name,
-                message: err.response.body.message
-              },
-              isSending: false
-            })
-          }
-          else throw err
-        })
-    })
-
-    e.preventDefault()
-  }
-
-  render () {
-    return (
-      <div className='SignupContainer'>
-        <img className='logo' src='../../resources/favicon-230x230.png'/>
-
-        <nav className='authNavigator text-center'><Link to='/login' activeClassName='active'>Log In</Link> / <Link to='/signup' activeClassName='active'>Sign Up</Link></nav>
-
-        <form onSubmit={e => this.handleSubmit(e)}>
-          <div className='formField'>
-            <input valueLink={this.linkState('user.email')} type='text' placeholder='E-mail'/>
-          </div>
-          <div className='formField'>
-            <input valueLink={this.linkState('user.password')} type='password' placeholder='Password'/>
-          </div>
-          <div className='formField'>
-            <input valueLink={this.linkState('user.name')} type='text' placeholder='name'/>
-          </div>
-          <div className='formField'>
-            <input valueLink={this.linkState('user.profileName')} type='text' placeholder='Profile name'/>
-          </div>
-
-          {this.state.isSending ? (
-            <p className='alertInfo'>Signing up...</p>
-          ) : null}
-
-          {this.state.error != null ? <p className='alertError'>{this.state.error.message}</p> : null}
-
-          <div className='formField'>
-            <button className='logInButton' type='submit'>Sign Up</button>
-          </div>
-        </form>
-
-        <p className='alert'>会員登録することで、<a onClick={this.openExternal} href='http://boostio.github.io/regulations.html'>当サイトの利用規約</a>及び<a onClick={this.openExternal} href='http://boostio.github.io/privacypolicies.html'>Cookieの使用を含むデータに関するポリシー</a>に同意するものとします。</p>
-      </div>
-    )
-  }
-}
-
-SignupContainer.propTypes = {
-  history: PropTypes.shape({
-    pushState: PropTypes.func
-  })
-}
diff --git a/lib/actions.js b/browser/main/actions.js
similarity index 100%
rename from lib/actions.js
rename to browser/main/actions.js
diff --git a/browser/main/favicon.ico b/browser/main/favicon.ico
deleted file mode 100644
index ad6a19a4..00000000
Binary files a/browser/main/favicon.ico and /dev/null differ
diff --git a/lib/components/modal/CreateNewFolder.js b/browser/main/modal/CreateNewFolder.js
similarity index 100%
rename from lib/components/modal/CreateNewFolder.js
rename to browser/main/modal/CreateNewFolder.js
diff --git a/lib/components/modal/CreateNewTeam.js b/browser/main/modal/CreateNewTeam.js
similarity index 100%
rename from lib/components/modal/CreateNewTeam.js
rename to browser/main/modal/CreateNewTeam.js
diff --git a/lib/components/modal/EditedAlert.js b/browser/main/modal/EditedAlert.js
similarity index 100%
rename from lib/components/modal/EditedAlert.js
rename to browser/main/modal/EditedAlert.js
diff --git a/lib/components/modal/Preference/AppSettingTab.js b/browser/main/modal/Preference/AppSettingTab.js
similarity index 100%
rename from lib/components/modal/Preference/AppSettingTab.js
rename to browser/main/modal/Preference/AppSettingTab.js
diff --git a/lib/components/modal/Preference/ContactTab.js b/browser/main/modal/Preference/ContactTab.js
similarity index 100%
rename from lib/components/modal/Preference/ContactTab.js
rename to browser/main/modal/Preference/ContactTab.js
diff --git a/lib/components/modal/Preference/FolderRow.js b/browser/main/modal/Preference/FolderRow.js
similarity index 100%
rename from lib/components/modal/Preference/FolderRow.js
rename to browser/main/modal/Preference/FolderRow.js
diff --git a/lib/components/modal/Preference/FolderSettingTab.js b/browser/main/modal/Preference/FolderSettingTab.js
similarity index 100%
rename from lib/components/modal/Preference/FolderSettingTab.js
rename to browser/main/modal/Preference/FolderSettingTab.js
diff --git a/lib/components/modal/Preference/HelpTab.js b/browser/main/modal/Preference/HelpTab.js
similarity index 100%
rename from lib/components/modal/Preference/HelpTab.js
rename to browser/main/modal/Preference/HelpTab.js
diff --git a/lib/components/modal/Preference/MemberRow.js b/browser/main/modal/Preference/MemberRow.js
similarity index 100%
rename from lib/components/modal/Preference/MemberRow.js
rename to browser/main/modal/Preference/MemberRow.js
diff --git a/lib/components/modal/Preference/MemberSettingTab.js b/browser/main/modal/Preference/MemberSettingTab.js
similarity index 100%
rename from lib/components/modal/Preference/MemberSettingTab.js
rename to browser/main/modal/Preference/MemberSettingTab.js
diff --git a/lib/components/modal/Preference/TeamSettingTab.js b/browser/main/modal/Preference/TeamSettingTab.js
similarity index 100%
rename from lib/components/modal/Preference/TeamSettingTab.js
rename to browser/main/modal/Preference/TeamSettingTab.js
diff --git a/lib/components/modal/Preferences.js b/browser/main/modal/Preferences.js
similarity index 100%
rename from lib/components/modal/Preferences.js
rename to browser/main/modal/Preferences.js
diff --git a/lib/components/modal/Tutorial.js b/browser/main/modal/Tutorial.js
similarity index 100%
rename from lib/components/modal/Tutorial.js
rename to browser/main/modal/Tutorial.js
diff --git a/lib/reducer.js b/browser/main/reducer.js
similarity index 100%
rename from lib/reducer.js
rename to browser/main/reducer.js
diff --git a/lib/store.js b/browser/main/store.js
similarity index 100%
rename from lib/store.js
rename to browser/main/store.js
diff --git a/browser/styles/main/containers/LoginContainer.styl b/browser/styles/main/containers/LoginContainer.styl
deleted file mode 100644
index aa35c41a..00000000
--- a/browser/styles/main/containers/LoginContainer.styl
+++ /dev/null
@@ -1,89 +0,0 @@
-.LoginContainer, .SignupContainer
-  margin 0 auto
-  padding 105px 15px
-  box-sizing border-box
-  color inactiveTextColor
-  .logo
-    width 150px
-    height 150px
-    display block
-    margin 0 auto
-  .authNavigator
-    margin 15px 0 25px
-    a
-      font-size 1.5em
-      text-decoration none
-      color inactiveTextColor
-      &:hover, &.hover, &:active, &.active
-        color brandColor
-  .socialControl
-    text-align center
-    margin 25px 0
-    p
-      margin-bottom 25px
-    .facebookBtn, .githubBtn
-      margin 0 45px
-      width 50px
-      height 50px
-      line-height 50px
-      font-size 25px
-      text-align center
-      background-image none
-      color white
-      border none
-      border-radius 25px
-      cursor pointer
-    .facebookBtn
-      background-color facebookColor
-      &:hover, &.hover
-        background-color lighten(facebookColor, 25%)
-    .githubBtn
-      background-color githubBtn
-      font-size 30px
-      line-height 30px
-      &:hover, &.hover
-        background-color lighten(githubBtn, 25%)
-  .divider
-    .dividerLabel
-      text-align center
-      position relative
-      top -27px
-      font-size 1.3em
-      background-color backgroundColor
-      margin 0 auto
-      width 50px
-  form
-    width 400px
-    margin 0 auto 45px
-    .alertInfo, .alertError
-      margin-top 15px
-      margin-bottom 15px
-      padding 10px
-      border-radius 5px
-      line-height 1.6
-      text-align center
-    .alertInfo
-      alertInfo()
-    .alertError
-      alertError()
-    div.formField
-      input
-        stripInput()
-        height 33px
-        width 100%
-        margin-bottom 10px
-        text-align center
-        font-size 1.1em
-      &:last-child
-        margin-top 15px
-      button.logInButton
-        btnPrimary()
-        height 44px
-        border-radius 22px
-        display block
-        width 200px
-        font-size 1em
-        margin 0 auto
-  p.alert
-    text-align center
-    font-size 0.8em
diff --git a/config.js b/config.js
deleted file mode 100644
index 002fe929..00000000
--- a/config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// export const API_URL = 'http://localhost:8000/'
-export const API_URL = 'http://boost-api4.elasticbeanstalk.com/'
-// export API_URL 'https://api2.b00st.io/'
diff --git a/lib/auth.js b/lib/auth.js
deleted file mode 100644
index 4f248250..00000000
--- a/lib/auth.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// initial value
-var currentUser = JSON.parse(localStorage.getItem('currentUser'))
-var currentToken = localStorage.getItem('token')
-
-function user (user, newToken) {
-  if (user != null) {
-    localStorage.setItem('currentUser', JSON.stringify(user))
-    currentUser = user
-  }
-
-  if (newToken != null) {
-    localStorage.setItem('token', newToken)
-    currentToken = newToken
-  }
-
-  return currentUser
-}
-
-function token () {
-  return currentToken
-}
-
-function clear () {
-  localStorage.removeItem('currentUser')
-  localStorage.removeItem('token')
-  currentUser = null
-  currentToken = null
-}
-
-export default {
-  user,
-  token,
-  clear
-}
diff --git a/finder.js b/lib/finder-app.js
similarity index 100%
rename from finder.js
rename to lib/finder-app.js
diff --git a/atom-lib/finder-window.js b/lib/finder-window.js
similarity index 100%
rename from atom-lib/finder-window.js
rename to lib/finder-window.js
diff --git a/browser/finder/index.html b/lib/finder.html
similarity index 100%
rename from browser/finder/index.html
rename to lib/finder.html
diff --git a/hotkey.js b/lib/hotkey.js
similarity index 100%
rename from hotkey.js
rename to lib/hotkey.js
diff --git a/main.js b/lib/main-app.js
similarity index 100%
rename from main.js
rename to lib/main-app.js
diff --git a/atom-lib/main-window.js b/lib/main-window.js
similarity index 100%
rename from atom-lib/main-window.js
rename to lib/main-window.js
diff --git a/browser/main/index.html b/lib/main.html
similarity index 100%
rename from browser/main/index.html
rename to lib/main.html
diff --git a/atom-lib/menu-template.js b/lib/menu-template.js
similarity index 88%
rename from atom-lib/menu-template.js
rename to lib/menu-template.js
index 6f35b602..5a327023 100644
--- a/atom-lib/menu-template.js
+++ b/lib/menu-template.js
@@ -96,16 +96,16 @@ var view = {
         BrowserWindow.getFocusedWindow().reload()
       }
     },
-    // {
-    //   label: 'Toggle Developer Tools',
-    //   accelerator: (function () {
-    //     if (process.platform === 'darwin') return 'Alt+Command+I'
-    //     else return 'Ctrl+Shift+I'
-    //   })(),
-    //   click: function (item, focusedWindow) {
-    //     if (focusedWindow) BrowserWindow.getFocusedWindow().toggleDevTools()
-    //   }
-    // }
+    {
+      label: 'Toggle Developer Tools',
+      accelerator: (function () {
+        if (process.platform === 'darwin') return 'Alt+Command+I'
+        else return 'Ctrl+Shift+I'
+      })(),
+      click: function (item, focusedWindow) {
+        if (focusedWindow) BrowserWindow.getFocusedWindow().toggleDevTools()
+      }
+    }
   ]
 }
 
diff --git a/lib/socket.js b/lib/socket.js
deleted file mode 100644
index 1f0eb597..00000000
--- a/lib/socket.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { API_URL } from '../config'
-import socketio from 'socket.io-client'
-import auth from './auth'
-import store from './store'
-import { updateUser, updateArticle, destroyArticle, destroyFolder } from './actions'
-
-export const CONN = 'CONN'
-export const ALERT = 'ALERT'
-export const USER_UPDATE = 'USER_UPDATE'
-export const ARTICLE_UPDATE = 'ARTICLE_UPDATE'
-export const ARTICLE_DESTROY = 'ARTICLE_DESTROY'
-export const FOLDER_DESTROY = 'FOLDER_DESTROY'
-
-let io = socketio(API_URL)
-
-io.on(CONN, function (data) {
-  console.log('connected', data)
-
-  let token = auth.token()
-  if (token != null) {
-    io.emit('JOIN', {token})
-  }
-})
-
-io.on(ALERT, function (data) {
-  console.log(ALERT, data)
-})
-
-io.on(USER_UPDATE, function (data) {
-  console.log(USER_UPDATE, data)
-  let { user } = data
-  store.dispatch(updateUser(user))
-})
-
-io.on(FOLDER_DESTROY, function (data) {
-  console.log(FOLDER_DESTROY, data)
-  store.dispatch(destroyFolder(data.TeamId, data.FolderId))
-})
-
-io.on(ARTICLE_UPDATE, function (data) {
-  console.log(ARTICLE_UPDATE, data)
-  let { userId, article } = data
-  store.dispatch(updateArticle(userId, article))
-})
-
-io.on(ARTICLE_DESTROY, function (data) {
-  console.log(ARTICLE_DESTROY, data)
-  let { userId, articleKey } = data
-  store.dispatch(destroyArticle(userId, articleKey))
-})
-
-export default io
diff --git a/lib/updater.js b/lib/updater.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/browser/finder/favicon.ico b/resources/favicon.ico
similarity index 100%
rename from browser/finder/favicon.ico
rename to resources/favicon.ico