Refactor
CI building