diff --git a/src/bootstrap.jsx b/src/bootstrap.js
similarity index 98%
rename from src/bootstrap.jsx
rename to src/bootstrap.js
index 6e66d34..6a68803 100644
--- a/src/bootstrap.jsx
+++ b/src/bootstrap.js
@@ -6,7 +6,7 @@ import ReactDOM from 'react-dom';
 import { ReduxRouter } from 'redux-router';
 import { Provider } from 'react-redux';
 
-import routes from './routes.jsx';
+import routes from './routes.js';
 
 import configureStore from './redux/configure-store.js';
 
diff --git a/src/components/CounterButton/CounterButton.jsx b/src/components/CounterButton/CounterButton.js
similarity index 100%
rename from src/components/CounterButton/CounterButton.jsx
rename to src/components/CounterButton/CounterButton.js
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.js
similarity index 80%
rename from src/components/Footer/Footer.jsx
rename to src/components/Footer/Footer.js
index 034fe67..9a0ef46 100644
--- a/src/components/Footer/Footer.jsx
+++ b/src/components/Footer/Footer.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import TwitterButton from './../TwitterButton/TwitterButton.jsx';
+import TwitterButton from './../TwitterButton/TwitterButton.js';
 
 const Footer = () => (
   <footer className="footer container">
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.js
similarity index 100%
rename from src/components/Header/Header.jsx
rename to src/components/Header/Header.js
diff --git a/src/components/IntroBox/IntroBox.jsx b/src/components/IntroBox/IntroBox.js
similarity index 100%
rename from src/components/IntroBox/IntroBox.jsx
rename to src/components/IntroBox/IntroBox.js
diff --git a/src/components/Profile/Profile.jsx b/src/components/Profile/Profile.js
similarity index 91%
rename from src/components/Profile/Profile.jsx
rename to src/components/Profile/Profile.js
index 1bc279d..7b5d384 100644
--- a/src/components/Profile/Profile.jsx
+++ b/src/components/Profile/Profile.js
@@ -1,8 +1,8 @@
 import React from 'react';
 
-import Panel from '../common/Panel.jsx';
-import Tr from '../common/Tr.jsx';
-import DisplayInfosPanel from '../common/DisplayInfosPanel.jsx';
+import Panel from '../common/Panel.js';
+import Tr from '../common/Tr.js';
+import DisplayInfosPanel from '../common/DisplayInfosPanel.js';
 
 const Profile = ({profile}) => {
   if (profile && profile.data) {
diff --git a/src/components/ProfileBox/ProfileBox.jsx b/src/components/ProfileBox/ProfileBox.js
similarity index 100%
rename from src/components/ProfileBox/ProfileBox.jsx
rename to src/components/ProfileBox/ProfileBox.js
diff --git a/src/components/ProfileList/ProfileList.jsx b/src/components/ProfileList/ProfileList.js
similarity index 94%
rename from src/components/ProfileList/ProfileList.jsx
rename to src/components/ProfileList/ProfileList.js
index 4e7a867..e241a0d 100644
--- a/src/components/ProfileList/ProfileList.jsx
+++ b/src/components/ProfileList/ProfileList.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router';
 
-import ProfileBox from './../ProfileBox/ProfileBox.jsx';
+import ProfileBox from './../ProfileBox/ProfileBox.js';
 
 const ProfileList = ({results}) => {
   if (results === null) {
diff --git a/src/components/Repos/Repos.jsx b/src/components/Repos/Repos.js
similarity index 88%
rename from src/components/Repos/Repos.jsx
rename to src/components/Repos/Repos.js
index 9630f37..a035935 100644
--- a/src/components/Repos/Repos.jsx
+++ b/src/components/Repos/Repos.js
@@ -1,9 +1,9 @@
 import React from 'react';
 
-import Panel from '../common/Panel.jsx';
-import DisplayInfosPanel from '../common/DisplayInfosPanel.jsx';
-import DisplayStars from '../common/DisplayStars.jsx';
-import ReposPaginator from '../ReposPaginator/ReposPaginator.jsx';
+import Panel from '../common/Panel.js';
+import DisplayInfosPanel from '../common/DisplayInfosPanel.js';
+import DisplayStars from '../common/DisplayStars.js';
+import ReposPaginator from '../ReposPaginator/ReposPaginator.js';
 
 export default class Repos extends React.Component {
 
diff --git a/src/components/ReposPaginator/ReposPaginator.jsx b/src/components/ReposPaginator/ReposPaginator.js
similarity index 98%
rename from src/components/ReposPaginator/ReposPaginator.jsx
rename to src/components/ReposPaginator/ReposPaginator.js
index 10b2cfd..d596806 100644
--- a/src/components/ReposPaginator/ReposPaginator.jsx
+++ b/src/components/ReposPaginator/ReposPaginator.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Spinner from '../common/Spinner.jsx';
+import Spinner from '../common/Spinner.js';
 
 export default class ReposPaginator extends React.Component {
 
diff --git a/src/components/SearchBox/SearchBox.jsx b/src/components/SearchBox/SearchBox.js
similarity index 95%
rename from src/components/SearchBox/SearchBox.jsx
rename to src/components/SearchBox/SearchBox.js
index 8160bfc..935d079 100644
--- a/src/components/SearchBox/SearchBox.jsx
+++ b/src/components/SearchBox/SearchBox.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import ProfileList from './../ProfileList/ProfileList.jsx';
-import Spinner from '../common/Spinner.jsx';
+import ProfileList from './../ProfileList/ProfileList.js';
+import Spinner from '../common/Spinner.js';
 
 /**
  * This component doesn't have state nor it has to know about connect or redux.
diff --git a/src/components/TwitterButton/TwitterButton.jsx b/src/components/TwitterButton/TwitterButton.js
similarity index 100%
rename from src/components/TwitterButton/TwitterButton.jsx
rename to src/components/TwitterButton/TwitterButton.js
diff --git a/src/components/common/DisplayInfosPanel.jsx b/src/components/common/DisplayInfosPanel.js
similarity index 93%
rename from src/components/common/DisplayInfosPanel.jsx
rename to src/components/common/DisplayInfosPanel.js
index b334555..44f4480 100644
--- a/src/components/common/DisplayInfosPanel.jsx
+++ b/src/components/common/DisplayInfosPanel.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import Panel from './Panel.jsx';
-import Spinner from './Spinner.jsx';
+import Panel from './Panel.js';
+import Spinner from './Spinner.js';
 
 const DisplayInfosPanel = ({infos, originalTitle}) => {
   const fetching = infos ? infos.fetching : false;
diff --git a/src/components/common/DisplayStars.jsx b/src/components/common/DisplayStars.js
similarity index 100%
rename from src/components/common/DisplayStars.jsx
rename to src/components/common/DisplayStars.js
diff --git a/src/components/common/Panel.jsx b/src/components/common/Panel.js
similarity index 100%
rename from src/components/common/Panel.jsx
rename to src/components/common/Panel.js
diff --git a/src/components/common/Spinner.jsx b/src/components/common/Spinner.js
similarity index 100%
rename from src/components/common/Spinner.jsx
rename to src/components/common/Spinner.js
diff --git a/src/components/common/Tr.jsx b/src/components/common/Tr.js
similarity index 100%
rename from src/components/common/Tr.jsx
rename to src/components/common/Tr.js
diff --git a/src/containers/App/App.jsx b/src/containers/App/App.js
similarity index 79%
rename from src/containers/App/App.jsx
rename to src/containers/App/App.js
index 1885802..fdfb6f5 100644
--- a/src/containers/App/App.jsx
+++ b/src/containers/App/App.js
@@ -2,8 +2,8 @@ import React from 'react';
 
 import { connect } from 'react-redux';
 
-import Header from '../../components/Header/Header.jsx';
-import Footer from '../../components/Footer/Footer.jsx';
+import Header from '../../components/Header/Header.js';
+import Footer from '../../components/Footer/Footer.js';
 
 const App = ({ children }) => {
   return (
diff --git a/src/containers/Github/Github.jsx b/src/containers/Github/Github.js
similarity index 86%
rename from src/containers/Github/Github.jsx
rename to src/containers/Github/Github.js
index 0784f7e..f9710eb 100644
--- a/src/containers/Github/Github.jsx
+++ b/src/containers/Github/Github.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import IntroBox from '../../components/IntroBox/IntroBox.jsx';
-import SearchBox from '../../components/SearchBox/SearchBox.jsx';
+import IntroBox from '../../components/IntroBox/IntroBox.js';
+import SearchBox from '../../components/SearchBox/SearchBox.js';
 
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
diff --git a/src/containers/GithubUser/GithubUser.jsx b/src/containers/GithubUser/GithubUser.js
similarity index 93%
rename from src/containers/GithubUser/GithubUser.jsx
rename to src/containers/GithubUser/GithubUser.js
index 6138b1d..20f7faf 100644
--- a/src/containers/GithubUser/GithubUser.jsx
+++ b/src/containers/GithubUser/GithubUser.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import Profile from '../../components/Profile/Profile.jsx';
-import Repos from '../../components/Repos/Repos.jsx';
+import Profile from '../../components/Profile/Profile.js';
+import Repos from '../../components/Repos/Repos.js';
 
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
diff --git a/src/containers/Home/Home.jsx b/src/containers/Home/Home.js
similarity index 100%
rename from src/containers/Home/Home.jsx
rename to src/containers/Home/Home.js
diff --git a/src/containers/Redux/Redux.jsx b/src/containers/Redux/Redux.js
similarity index 98%
rename from src/containers/Redux/Redux.jsx
rename to src/containers/Redux/Redux.js
index b42afcf..43a3f6e 100644
--- a/src/containers/Redux/Redux.jsx
+++ b/src/containers/Redux/Redux.js
@@ -3,7 +3,7 @@ import { Link } from 'react-router';
 
 import { connect } from 'react-redux';
 
-import CounterButton from '../../components/CounterButton/CounterButton.jsx';
+import CounterButton from '../../components/CounterButton/CounterButton.js';
 
 const Redux = ({ counter }) => {
   return (
diff --git a/src/containers/index.js b/src/containers/index.js
index 60dfcc9..548e503 100644
--- a/src/containers/index.js
+++ b/src/containers/index.js
@@ -1,5 +1,5 @@
-export { default as App } from './App/App.jsx';
-export { default as Github } from './Github/Github.jsx';
-export { default as GithubUser } from './GithubUser/GithubUser.jsx';
-export { default as Home } from './Home/Home.jsx';
-export { default as Redux } from './Redux/Redux.jsx';
+export { default as App } from './App/App.js';
+export { default as Github } from './Github/Github.js';
+export { default as GithubUser } from './GithubUser/GithubUser.js';
+export { default as Home } from './Home/Home.js';
+export { default as Redux } from './Redux/Redux.js';
diff --git a/src/routes.jsx b/src/routes.js
similarity index 100%
rename from src/routes.jsx
rename to src/routes.js
diff --git a/test/components/common/CounterButton.spec.js b/test/components/common/CounterButton.spec.js
index 830271c..119feb1 100644
--- a/test/components/common/CounterButton.spec.js
+++ b/test/components/common/CounterButton.spec.js
@@ -2,7 +2,7 @@ import expect from 'expect';
 import TestUtils from 'react-addons-test-utils';
 import React from 'react';
 
-import { CounterButton } from '../../../src/components/CounterButton/CounterButton.jsx';
+import { CounterButton } from '../../../src/components/CounterButton/CounterButton.js';
 
 function setup({counter = 0} = {}) {
   const props = {
diff --git a/webpack.config.js b/webpack.config.js
index 71d2c45..22bd150 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -125,7 +125,7 @@ var config = {
   entry: {
     "js/bundle": [
       'webpack/hot/only-dev-server',//removed on build mode
-      "./src/bootstrap.jsx"
+      "./src/bootstrap.js"
     ],
     "css/main": "./src/style/main.scss"
   },