Changed package name + small changes
small changes