Reorganize calc to follow Lilis' organization (and shorten the name).