Move test-files into subdirectories

R=kustermann@google.com
BUG=

Review URL: https://codereview.chromium.org//686043003