diff --git a/js/core/EventManager.js b/src/core/EventManager.js
similarity index 100%
rename from js/core/EventManager.js
rename to src/core/EventManager.js
diff --git a/js/core/GUI.js b/src/core/GUI.js
similarity index 100%
rename from js/core/GUI.js
rename to src/core/GUI.js
diff --git a/js/core/Keyboard.js b/src/core/Keyboard.js
similarity index 100%
rename from js/core/Keyboard.js
rename to src/core/Keyboard.js
diff --git a/js/core/Logger.js b/src/core/Logger.js
similarity index 100%
rename from js/core/Logger.js
rename to src/core/Logger.js
diff --git a/js/core/MinimalStim.js b/src/core/MinimalStim.js
similarity index 100%
rename from js/core/MinimalStim.js
rename to src/core/MinimalStim.js
diff --git a/js/core/Mouse.js b/src/core/Mouse.js
similarity index 100%
rename from js/core/Mouse.js
rename to src/core/Mouse.js
diff --git a/js/core/PsychoJS.js b/src/core/PsychoJS.js
similarity index 100%
rename from js/core/PsychoJS.js
rename to src/core/PsychoJS.js
diff --git a/js/core/ServerManager.js b/src/core/ServerManager.js
similarity index 100%
rename from js/core/ServerManager.js
rename to src/core/ServerManager.js
diff --git a/js/core/Window.js b/src/core/Window.js
similarity index 100%
rename from js/core/Window.js
rename to src/core/Window.js
diff --git a/js/core/WindowMixin.js b/src/core/WindowMixin.js
similarity index 100%
rename from js/core/WindowMixin.js
rename to src/core/WindowMixin.js
diff --git a/js/data/ExperimentHandler.js b/src/data/ExperimentHandler.js
similarity index 100%
rename from js/data/ExperimentHandler.js
rename to src/data/ExperimentHandler.js
diff --git a/js/data/TrialHandler.js b/src/data/TrialHandler.js
similarity index 100%
rename from js/data/TrialHandler.js
rename to src/data/TrialHandler.js
diff --git a/js/sound/Sound.js b/src/sound/Sound.js
similarity index 100%
rename from js/sound/Sound.js
rename to src/sound/Sound.js
diff --git a/js/sound/SoundPlayer.js b/src/sound/SoundPlayer.js
similarity index 100%
rename from js/sound/SoundPlayer.js
rename to src/sound/SoundPlayer.js
diff --git a/js/sound/TonePlayer.js b/src/sound/TonePlayer.js
similarity index 100%
rename from js/sound/TonePlayer.js
rename to src/sound/TonePlayer.js
diff --git a/js/sound/TrackPlayer.js b/src/sound/TrackPlayer.js
similarity index 100%
rename from js/sound/TrackPlayer.js
rename to src/sound/TrackPlayer.js
diff --git a/js/util/Clock.js b/src/util/Clock.js
similarity index 100%
rename from js/util/Clock.js
rename to src/util/Clock.js
diff --git a/js/util/Color.js b/src/util/Color.js
similarity index 100%
rename from js/util/Color.js
rename to src/util/Color.js
diff --git a/js/util/ColorMixin.js b/src/util/ColorMixin.js
similarity index 100%
rename from js/util/ColorMixin.js
rename to src/util/ColorMixin.js
diff --git a/js/util/EventEmitter.js b/src/util/EventEmitter.js
similarity index 100%
rename from js/util/EventEmitter.js
rename to src/util/EventEmitter.js
diff --git a/js/util/PsychObject.js b/src/util/PsychObject.js
similarity index 100%
rename from js/util/PsychObject.js
rename to src/util/PsychObject.js
diff --git a/js/util/Scheduler.js b/src/util/Scheduler.js
similarity index 100%
rename from js/util/Scheduler.js
rename to src/util/Scheduler.js
diff --git a/js/util/Util.js b/src/util/Util.js
similarity index 100%
rename from js/util/Util.js
rename to src/util/Util.js
diff --git a/js/visual/Form.js b/src/visual/Form.js
similarity index 100%
rename from js/visual/Form.js
rename to src/visual/Form.js
diff --git a/js/visual/ImageStim.js b/src/visual/ImageStim.js
similarity index 100%
rename from js/visual/ImageStim.js
rename to src/visual/ImageStim.js
diff --git a/js/visual/MovieStim.js b/src/visual/MovieStim.js
similarity index 100%
rename from js/visual/MovieStim.js
rename to src/visual/MovieStim.js
diff --git a/js/visual/Polygon.js b/src/visual/Polygon.js
similarity index 100%
rename from js/visual/Polygon.js
rename to src/visual/Polygon.js
diff --git a/js/visual/Rect.js b/src/visual/Rect.js
similarity index 100%
rename from js/visual/Rect.js
rename to src/visual/Rect.js
diff --git a/js/visual/ShapeStim.js b/src/visual/ShapeStim.js
similarity index 100%
rename from js/visual/ShapeStim.js
rename to src/visual/ShapeStim.js
diff --git a/js/visual/Slider.js b/src/visual/Slider.js
similarity index 100%
rename from js/visual/Slider.js
rename to src/visual/Slider.js
diff --git a/js/visual/TextBox.js b/src/visual/TextBox.js
similarity index 100%
rename from js/visual/TextBox.js
rename to src/visual/TextBox.js
diff --git a/js/visual/TextInput.js b/src/visual/TextInput.js
similarity index 100%
rename from js/visual/TextInput.js
rename to src/visual/TextInput.js
diff --git a/js/visual/TextStim.js b/src/visual/TextStim.js
similarity index 100%
rename from js/visual/TextStim.js
rename to src/visual/TextStim.js
diff --git a/js/visual/VisualStim.js b/src/visual/VisualStim.js
similarity index 100%
rename from js/visual/VisualStim.js
rename to src/visual/VisualStim.js