Remove old implementation

and update to use the new impl

BUG=None

Review URL: https://codereview.appspot.com/7102048
Rename files

BUG=None

Review URL: https://codereview.appspot.com/7105048