Refactored package name, various enchancements