diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..3d688b8720
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/src/out/
+node_modules
+/src/v8/
+/src/tools/protoc_wrapper/
+/src/third_party/protobuf/
+/src/third_party/zlib/
+/src/third_party/rust_crates/libc/
+/src/.gclient_entries
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 5b720fd155..0000000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-out/
-js/.cache/
-js/node_modules/
-v8/
-tools/protoc_wrapper/
-third_party/protobuf/
-third_party/zlib/
-third_party/rust_crates/libc/
-.gclient_entries
diff --git a/src/tools/format.sh b/src/tools/format.sh
deleted file mode 100755
index fec9fab398..0000000000
--- a/src/tools/format.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-cd `dirname "$0"`/..
-clang-format -i -style Google *.cc *.h include/*.h
-gn format BUILD.gn
-gn format deno.gni
-gn format .gn
-yapf -i tools/*.py js/*.py
-prettier --write \
-	js/deno.d.ts \
-  js/main.ts \
-  js/mock_runtime.js \
-  js/tsconfig.json
-# Do not format these. 
-#  js/msg.pb.js
-#  js/msg.pb.d.ts
-
-rustfmt --write-mode overwrite *.rs
diff --git a/src/tools/lint.sh b/src/tools/lint.sh
deleted file mode 100755
index 64a452f0aa..0000000000
--- a/src/tools/lint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd `dirname "$0"`/..
-set -e -v
-cpplint --filter=-build/include_subdir --repository=.  *.cc *.h include/*.h
diff --git a/tools/format.sh b/tools/format.sh
new file mode 100755
index 0000000000..0a5967c52d
--- /dev/null
+++ b/tools/format.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+cd `dirname "$0"`/..
+clang-format -i -style Google src/*.cc src/*.h src/include/*.h
+
+# TODO(ry) Remove pushd/popd once .gn is moved to root.
+pushd src/
+gn format BUILD.gn
+gn format deno.gni
+gn format .gn
+popd
+
+yapf -i src/js/*.py
+prettier --write \
+  src/js/deno.d.ts \
+  src/js/main.ts \
+  src/js/mock_runtime.js \
+  src/js/tsconfig.json
+# Do not format these.
+#  src/js/msg.pb.js
+#  src/js/msg.pb.d.ts
+
+rustfmt --write-mode overwrite src/*.rs
diff --git a/tools/lint.sh b/tools/lint.sh
new file mode 100755
index 0000000000..c14cfa50de
--- /dev/null
+++ b/tools/lint.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+cd `dirname "$0"`/..
+cpplint --filter=-build/include_subdir --repository=src  \
+  src/*.cc \
+  src/*.h \
+  src/include/*.h