Checkpoint before re-organizing package structure