Change directory layout for gradle.

Now we're using build variants we may as well.