This is in line with the agreed conventions on where to put
files in a layered source package.
Essentially, just the final moving of things around and ensuring
that the dummy tests pass, along with lint.
Change-Id: I392568d6279f0a5876bdb2a3ad5e49fee03734aa