Separated directory model from handler and refactored templating.