Refactored a little: packages, modules, handlers, templates