Renamed files again to be able to publish to bintray