CAL refactoring

Signed-off-by: Leslie Giles <Leslie.Giles@riftio.com>
28 files changed