Changed packagename etc