Split up the [Import] lines

This way we can remove them incrementally