package name added and a few other changes