Renamed files so they don't conflict in android studio...