Merge "Moved source to match upstream file structure"
am: 7d62b5836f

Change-Id: Ic210a14f272e8c8a08b78edc2e5bc6e570309df8