Permissions; Code cleanup; changed package name