diff --git a/env.el b/env.el
index 9e40258..d66c274 100644
--- a/env.el
+++ b/env.el
@@ -1,12 +1,12 @@
 ;; Homebrew
 (push "/usr/local/bin" exec-path)
 
-;; rbenv
-(setq exec-path (cons "~/.rbenv/bin" exec-path))
-(setenv "PATH" (concat "~/.rbenv/bin:" (getenv "PATH")))
-(setq exec-path (cons "~/.rbenv/shims" exec-path))
-(setenv "PATH" (concat "~/.rbenv/shims:" (getenv "PATH")))
+;; ;; rbenv
+;; (setq exec-path (cons "~/.rbenv/bin" exec-path))
+;; (setenv "PATH" (concat "~/.rbenv/bin:" (getenv "PATH")))
+;; (setq exec-path (cons "~/.rbenv/shims" exec-path))
+;; (setenv "PATH" (concat "~/.rbenv/shims:" (getenv "PATH")))
 
-;; node.js
-(setq exec-path (cons "~/.nvm/v0.10.24/bin" exec-path))
-(setenv "PATH" (concat "~/.nvm/v0.10.24/bin:" (getenv "PATH")))
+;; ;; node.js
+;; (setq exec-path (cons "~/.nvm/v0.10.24/bin" exec-path))
+;; (setenv "PATH" (concat "~/.nvm/v0.10.24/bin:" (getenv "PATH")))
diff --git a/init.el b/init.el
index 5295672..d579f87 100644
--- a/init.el
+++ b/init.el
@@ -28,6 +28,10 @@
 (load-file (get-config-path "remember.el"))
 (load-file (get-config-path "project-definitions.el"))
 
+;; Load runtime specific setup files
+(load-file (get-config-path "runtimes/ruby.el"))
+(load-file (get-config-path "runtimes/nodejs.el"))
+
 ;; Custom variables file
 (setq custom-file (get-config-path "custom-variables.el"))
 (load-file custom-file)
diff --git a/packages.el b/packages.el
index 9a1ee56..7c9d4dc 100644
--- a/packages.el
+++ b/packages.el
@@ -68,12 +68,14 @@
     minimap
     move-text
     multiple-cursors
+    nvm
     phi-search
     php-mode
     projectile
     puppet-mode
     pt
     rainbow-mode
+    rbenv
     restclient
     rhtml-mode
     rubocop
diff --git a/runtimes/nodejs.el b/runtimes/nodejs.el
new file mode 100644
index 0000000..de57fbb
--- /dev/null
+++ b/runtimes/nodejs.el
@@ -0,0 +1,7 @@
+;; node.js
+(setq exec-path (cons "~/.nvm/v0.10.24/bin" exec-path))
+;; (setenv "PATH" (concat "~/.nvm/v0.10.24/bin:" (getenv "PATH")))
+
+
+(when (require 'nvm nil 'noerror)
+  (nvm-use "v0.10.24"))
diff --git a/runtimes/ruby.el b/runtimes/ruby.el
new file mode 100644
index 0000000..05c0d73
--- /dev/null
+++ b/runtimes/ruby.el
@@ -0,0 +1,6 @@
+;; rbenv
+(setq exec-path (cons "~/.rbenv/bin" exec-path))
+(setq exec-path (cons "~/.rbenv/shims" exec-path))
+
+(when (require 'rbenv nil 'noerror)
+  (global-rbenv-mode))