diff --git a/.travis.yml b/.travis.yml
index 405d54c..1bc02f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: viml
-script: ./other/travis.sh
+script: ./tests/travis.sh
 cache:
     apt: true
     directories:
-        - other/tmp
+        - tests/tmp
 before_install:
     - sudo apt-get -qq install software-properties-common
     - sudo add-apt-repository -y ppa:neovim-ppa/unstable
diff --git a/README.md b/README.md
index 0a90d74..a7afd1d 100644
--- a/README.md
+++ b/README.md
@@ -40,10 +40,10 @@ Nim support for vim and advanced support for neovim. Still in heavy development.
 
 ## Screenshots
 
-![Syntax highlighting](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/other/screenshots/syntaxhl.png)
-![Autocomplete](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/other/screenshots/autocomplete.png)
-![Definition](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/other/screenshots/definition.png)
-![Usages](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/other/screenshots/usages.png)
+![Syntax highlighting](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/misc/screenshots/syntaxhl.png)
+![Autocomplete](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/misc/screenshots/autocomplete.png)
+![Definition](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/misc/screenshots/definition.png)
+![Usages](https://raw.githubusercontent.com/baabelfish/nvim-nim/master/misc/screenshots/usages.png)
 
 
 ## Planned features
diff --git a/other/screenshots/autocomplete.png b/misc/screenshots/autocomplete.png
similarity index 100%
rename from other/screenshots/autocomplete.png
rename to misc/screenshots/autocomplete.png
diff --git a/other/screenshots/definition.png b/misc/screenshots/definition.png
similarity index 100%
rename from other/screenshots/definition.png
rename to misc/screenshots/definition.png
diff --git a/other/screenshots/syntaxhl.png b/misc/screenshots/syntaxhl.png
similarity index 100%
rename from other/screenshots/syntaxhl.png
rename to misc/screenshots/syntaxhl.png
diff --git a/other/screenshots/usages.png b/misc/screenshots/usages.png
similarity index 100%
rename from other/screenshots/usages.png
rename to misc/screenshots/usages.png
diff --git a/other/nvimcfg/init.vim b/tests/nvimcfg/init.vim
similarity index 100%
rename from other/nvimcfg/init.vim
rename to tests/nvimcfg/init.vim
diff --git a/other/rc.vim b/tests/rc.vim
similarity index 100%
rename from other/rc.vim
rename to tests/rc.vim
diff --git a/other/run_tests.sh b/tests/run_tests.sh
similarity index 92%
rename from other/run_tests.sh
rename to tests/run_tests.sh
index 6fb8d08..5421ce5 100755
--- a/other/run_tests.sh
+++ b/tests/run_tests.sh
@@ -8,8 +8,6 @@ fi
 
 # Run tests
 # Running test
-nvim --version
-echo "Testing"
 nvim -u rc.vim -c 'Vader! tests/**/*.vader'
 # nvim -u rc.vim -c 'Vader! tests/**/*.vader' > /dev/null
 err=$?
diff --git a/other/tests/nimsuggest/suggestions.nim b/tests/tests/nimsuggest/suggestions.nim
similarity index 100%
rename from other/tests/nimsuggest/suggestions.nim
rename to tests/tests/nimsuggest/suggestions.nim
diff --git a/other/tests/nimsuggest/tmodule.nim b/tests/tests/nimsuggest/tmodule.nim
similarity index 100%
rename from other/tests/nimsuggest/tmodule.nim
rename to tests/tests/nimsuggest/tmodule.nim
diff --git a/other/tests/nimsuggest/tother.nim b/tests/tests/nimsuggest/tother.nim
similarity index 100%
rename from other/tests/nimsuggest/tother.nim
rename to tests/tests/nimsuggest/tother.nim
diff --git a/other/tests/nimsuggest/util.nim b/tests/tests/nimsuggest/util.nim
similarity index 100%
rename from other/tests/nimsuggest/util.nim
rename to tests/tests/nimsuggest/util.nim
diff --git a/other/tests/vim/definition.vader b/tests/tests/vim/definition.vader
similarity index 100%
rename from other/tests/vim/definition.vader
rename to tests/tests/vim/definition.vader
diff --git a/other/tests/vim/indent.vader b/tests/tests/vim/indent.vader
similarity index 100%
rename from other/tests/vim/indent.vader
rename to tests/tests/vim/indent.vader
diff --git a/other/tests/vim/smoke.vader b/tests/tests/vim/smoke.vader
similarity index 100%
rename from other/tests/vim/smoke.vader
rename to tests/tests/vim/smoke.vader
diff --git a/other/tests/vim/syntax.vader b/tests/tests/vim/syntax.vader
similarity index 100%
rename from other/tests/vim/syntax.vader
rename to tests/tests/vim/syntax.vader
diff --git a/other/testwatcher.sh b/tests/testwatcher.sh
similarity index 100%
rename from other/testwatcher.sh
rename to tests/testwatcher.sh
diff --git a/other/travis.sh b/tests/travis.sh
similarity index 100%
rename from other/travis.sh
rename to tests/travis.sh