Coils: Stage 1 refactoring