refactor calendar service, added week json