CI refactor

please do not merge yet...