moved Handler from package to module