Checkpoint before some major restructuring
Moved CIMI to root