Try using new CI folder stuff