Move files back to their original locations

Change-Id: Id30d31b9f3986d379749bbe1ec6ab3cee457872f