move default handlers
move old demo to client repo