package name change and some last minute changes