Split things so that there can be a standalone zavai-calendar application