Place files in correct location for real

Change-Id: Iffda1a388593c1f763b1caeceb06f0ff027d6cbd