Updated package names
Fixed project configuration