diff --git a/rlkit/launchers/launcher_util.py b/rlkit/launchers/launcher_util.py
index d50eb71b9..111169446 100644
--- a/rlkit/launchers/launcher_util.py
+++ b/rlkit/launchers/launcher_util.py
@@ -90,7 +90,7 @@ def run_experiment_here(
         variant=None,
         exp_id=0,
         seed=None,
-        use_gpu=True,
+        use_gpu=False,
         # Logger params:
         exp_prefix="default",
         snapshot_mode='last',
@@ -565,7 +565,7 @@ def foo(variant):
                 ))
             except git.exc.InvalidGitRepositoryError:
                 pass
-    except ImportError:
+    except (ImportError, UnboundLocalError):
         git_infos = None
     run_experiment_kwargs = dict(
         exp_prefix=exp_prefix,
diff --git a/rlkit/scripts/__init__.py b/rlkit/scripts/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/scripts/run_experiment_from_doodad.py b/rlkit/scripts/run_experiment_from_doodad.py
similarity index 100%
rename from scripts/run_experiment_from_doodad.py
rename to rlkit/scripts/run_experiment_from_doodad.py
diff --git a/scripts/sim_goal_conditioned_policy.py b/rlkit/scripts/sim_goal_conditioned_policy.py
similarity index 100%
rename from scripts/sim_goal_conditioned_policy.py
rename to rlkit/scripts/sim_goal_conditioned_policy.py
diff --git a/scripts/sim_policy.py b/rlkit/scripts/sim_policy.py
similarity index 100%
rename from scripts/sim_policy.py
rename to rlkit/scripts/sim_policy.py
diff --git a/scripts/sim_tdm_policy.py b/rlkit/scripts/sim_tdm_policy.py
similarity index 100%
rename from scripts/sim_tdm_policy.py
rename to rlkit/scripts/sim_tdm_policy.py