We have working Apollo, Calculator sources :)

Change-Id: I409d86017f693c9d09b8cc6aba564aa71b695c7d