Move file to adhere to module declaration

Also be consistent with the other filename.

Change-Id: I8faf7a62ec05502141bb668f250606ed45a5cddd
(cherry picked from commit 8bd9e09d41a26afcda4f196fdfe48890b464c71a)