newly polymer'd files after code cleanup to work off of