Revert "Move paths to the right location."

This reverts commit 40acc514d85335fe5dd290c56bec744172423152.
Try something else.