Package Refactor

Refactor the whole package with instance method replacing the static methods for better testability, flexibility.