diff --git a/.appveyor.yml b/.appveyor.yml
index 0e73dbf545f8..c934dc9130d4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -73,8 +73,8 @@ test_script:
 
 after_test:
   - ps: cd $env:GOPATH\src\$env:PROJ
-  - python ..\scripts\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
-  - python ..\scripts\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
+  - python ..\dev-tools\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
+  - python ..\dev-tools\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
   - go tool cover -html=build\coverage\full.cov -o build\coverage\full.html
   - ps: Push-AppveyorArtifact build\coverage\full.cov
   - ps: Push-AppveyorArtifact build\coverage\full.html
diff --git a/Dockerfile b/Dockerfile
index 6b93ebfd9c97..8b6361e3d28a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN set -x \
 	golang.org/x/tools/cmd/cover \
 	golang.org/x/tools/cmd/vet
 
-COPY scripts/docker-entrypoint.sh /entrypoint.sh
+COPY libbeat/scripts/docker-entrypoint.sh /entrypoint.sh
 
 ENV GO15VENDOREXPERIMENT=1
 
diff --git a/scripts/aggregate_coverage.py b/dev-tools/aggregate_coverage.py
similarity index 100%
rename from scripts/aggregate_coverage.py
rename to dev-tools/aggregate_coverage.py
diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile
index 11af2b2ae2d4..30d0f67235cc 100755
--- a/libbeat/scripts/Makefile
+++ b/libbeat/scripts/Makefile
@@ -134,7 +134,7 @@ integration-tests-environment:
 .PHONY: system-tests
 system-tests: libbeat.test prepare-tests system-tests-setup
 	. build/system-tests/env/bin/activate; nosetests -w tests/system --process-timeout=$(TIMEOUT) --with-timer
-	python ${ES_BEATS}/scripts/aggregate_coverage.py -o ${COVERAGE_DIR}/system.cov ./build/system-tests/run
+	python ${ES_BEATS}/dev-tools/aggregate_coverage.py -o ${COVERAGE_DIR}/system.cov ./build/system-tests/run
 
 # Runs system tests without coverage reports and in parallel
 .PHONY: fast-system-tests
@@ -182,7 +182,7 @@ testsuite:
 # Generates a coverage report from the existing coverage files
 .PHONY: coverage-report
 coverage-report:
-	python ${ES_BEATS}/scripts/aggregate_coverage.py -o ./${COVERAGE_DIR}/full.cov ./${COVERAGE_DIR}
+	python ${ES_BEATS}/dev-tools/aggregate_coverage.py -o ./${COVERAGE_DIR}/full.cov ./${COVERAGE_DIR}
 	go tool cover -html=./${COVERAGE_DIR}/full.cov -o ${COVERAGE_DIR}/full.html
 	test ! -s ./${COVERAGE_DIR}/unit.cov   || go tool cover -html=./${COVERAGE_DIR}/unit.cov   -o ${COVERAGE_DIR}/unit.html
 	test ! -s ./${COVERAGE_DIR}/system.cov || go tool cover -html=./${COVERAGE_DIR}/system.cov -o ${COVERAGE_DIR}/system.html
diff --git a/libbeat/scripts/README.md b/libbeat/scripts/README.md
index 502047ff9334..5533c1f83b71 100644
--- a/libbeat/scripts/README.md
+++ b/libbeat/scripts/README.md
@@ -4,8 +4,6 @@ Below is a brief description of each file / folder.
 
 | File / Folder        | Description                                                                                                                                            |
 |----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|
-| docker               | Folder for all docker related files which are needed for the test environment                                                                          |
-| crosscompile.bash    | Script to crosscompile a beat for all platforms. Use make crosscompile to use this script.                                                             |
 | docker-entrypoint.sh | Entrypoint file used for the Dockerfile                                                                                                                |
 | Makefile             | General Makefile which is copied over to all beats. This contains the basic methods which are shared across all beat                                   |
 | update.sh            | This scripts brings a beat up-to-date based on the files in libbeat. This script should only be executed in a beat itself through running make update. |
diff --git a/scripts/docker-entrypoint.sh b/libbeat/scripts/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker-entrypoint.sh
rename to libbeat/scripts/docker-entrypoint.sh
diff --git a/winlogbeat/make.bat b/winlogbeat/make.bat
index 0cd4b00dff2f..30a0754c30ac 100644
--- a/winlogbeat/make.bat
+++ b/winlogbeat/make.bat
@@ -24,9 +24,9 @@ nosetests -v -w tests\system --process-timeout=30
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo Aggregating Coverage Reports
-python ..\scripts\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
+python ..\dev-tools\aggregate_coverage.py -o build\coverage\system.cov .\build\system-tests\run
 if %errorlevel% neq 0 exit /b %errorlevel%
-python ..\scripts\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
+python ..\dev-tools\aggregate_coverage.py -o build\coverage\full.cov .\build\coverage
 if %errorlevel% neq 0 exit /b %errorlevel%
 go tool cover -html=build\coverage\full.cov -o build\coverage\full.html
 if %errorlevel% neq 0 exit /b %errorlevel%