Refactor to more reusable (open) classes
Rewrite demo server to new handler architecture