Changed package names and few other fixes