diff --git a/python/Makefile b/python/Makefile
index 839edb3c5..460ce5af9 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -5,8 +5,8 @@ GHERKIN_PARSER = gherkin/parser.py
 GHERKIN_RAZOR = gherkin-python.razor
 SOURCE_FILES = $(shell find . -name "*.py" | grep -v $(GHERKIN_PARSER))
 
-GHERKIN = python -m gherkin.scripts.gherkin
-GHERKIN_GENERATE_TOKENS = python -m gherkin.scripts.generate_tokens
+GHERKIN = python -m scripts.gherkin
+GHERKIN_GENERATE_TOKENS = python -m scripts.generate_tokens
 
 GOOD_FEATURE_FILES = $(shell find ../testdata/good -name "*.feature")
 BAD_FEATURE_FILES  = $(shell find ../testdata/bad -name "*.feature")
diff --git a/python/gherkin/scripts/__init__.py b/python/scripts/__init__.py
similarity index 100%
rename from python/gherkin/scripts/__init__.py
rename to python/scripts/__init__.py
diff --git a/python/gherkin/scripts/generate_tokens.py b/python/scripts/generate_tokens.py
similarity index 100%
rename from python/gherkin/scripts/generate_tokens.py
rename to python/scripts/generate_tokens.py
diff --git a/python/gherkin/scripts/gherkin.py b/python/scripts/gherkin.py
similarity index 100%
rename from python/gherkin/scripts/gherkin.py
rename to python/scripts/gherkin.py