Move file to adhere to module declaration

Also be consistent with the other filename.

Change-Id: I8faf7a62ec05502141bb668f250606ed45a5cddd
Merge "Move file to adhere to module declaration"