Renamed files, fixed style mistakes.

Change-Id: I7a998b64ac56b852b28981dcbb228631ae7643b2