tune structure of handlers for Application
move package handlers to single module file handler