Changed package names and some updates