More CI and base file organization