[refactor] package handler to be static class