diff --git a/README.rst b/README.rst
index 73a0358..4fde068 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,7 @@ See http://bitcointrezor.com for more information.
 Example
 -------
 
-also found in ``helloworld.py``
+also found in ``tools/helloworld.py``
 
 .. code:: python
 
diff --git a/tools/encfs_aes_getpass.py b/tools/encfs_aes_getpass.py
index c8f4837..03e0400 100755
--- a/tools/encfs_aes_getpass.py
+++ b/tools/encfs_aes_getpass.py
@@ -88,7 +88,7 @@ def main():
     if not os.path.exists(passw_file):
         # New encfs drive, let's generate password
 
-        sys.stderr.write('Please provide label for new drive:')
+        sys.stderr.write('Please provide label for new drive: ')
         label = input()
 
         sys.stderr.write('Computer asked TREZOR for new strong password.\n')
diff --git a/helloworld.py b/tools/helloworld.py
similarity index 100%
rename from helloworld.py
rename to tools/helloworld.py
diff --git a/readmem.py b/tools/mem_read.py
old mode 100644
new mode 100755
similarity index 100%
rename from readmem.py
rename to tools/mem_read.py
diff --git a/writemem.py b/tools/mem_write.py
old mode 100644
new mode 100755
similarity index 100%
rename from writemem.py
rename to tools/mem_write.py
diff --git a/mnemonic_check.py b/tools/mnemonic_check.py
similarity index 100%
rename from mnemonic_check.py
rename to tools/mnemonic_check.py
diff --git a/signtest.py b/tools/signtest.py
similarity index 100%
rename from signtest.py
rename to tools/signtest.py